address Clancy's comments for PR

FRBs · Jul 21, 2023 · 04c0282 · 04c0282
1 parent cbfb1e6
commit 04c0282
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 189 deletions.
diff --git a/.gitignore b/.gitignore
@@ -170,8 +170,3 @@ zdm/untitled10.py
 
 *.DS_Store
 papers/H0_I/Analysis/Real/minicube_real.src
-
-
-zdm/data/Surveys/private_CRAFT_ICS_892.ecsv
-zdm/data/Surveys/private_CRAFT_ICS_1272.ecsv
-zdm/data/Surveys/private_CRAFT_ICS_1632.ecsv
diff --git a/papers/F/Analysis/CRACO/Cloud/deprecated/OutputH0F.tar.gz b/papers/F/Analysis/CRACO/Cloud/deprecated/OutputH0F.tar.gz
diff --git a/papers/F/Analysis/Real/Cloud/Output_low_res/explore.ipynb b/papers/F/Analysis/Real/Cloud/Output_low_res/explore.ipynb
diff --git a/papers/F/Analysis/Real/Cloud/run_craco_real.py b/papers/F/Analysis/Real/Cloud/run_craco_real.py
@@ -42,8 +42,18 @@ def main(
     if int(ntotal / total_ncpu) != nper_cpu:
         raise IOError(f"Ncpu={total_ncpu} must divide evenly into ntotal={ntotal}")
 
+    start = pargs.start
+    end = pargs.end
+
     commands = []
-    for kk in range(pargs.ncpu):
+
+    nums = range(pargs.ncpu)
+
+    # Restrict to subset of CPUs if specified
+    if (start > 0) and (end > 0):
+        nums = np.arange(start-1, end, dtype="int")
+
+    for kk in nums:
         line = []
         # Which CPU is running out of the total?
         iCPU = (batch - 1) * pargs.ncpu + kk
@@ -102,6 +112,15 @@ def parse_option():
     parser.add_argument(
         "-b", "--batch", type=int, default=1, required=False, help="Batch number"
     )
+
+    # Optional restriction to subset of cube
+    parser.add_argument(
+        "-s", "--start", type=int, default=0, required=False, help="csv to start on",
+    )
+    parser.add_argument(
+        "-e", "--end", type=int, default=0, required=False, help="csv to end on (inclusive)",
+    )
+
     args = parser.parse_args()
 
     return args

diff --git a/papers/F/Analysis/Real/Cloud/run_real_craco_block.py b/papers/F/Analysis/Real/Cloud/run_real_craco_block.py
diff --git a/papers/F/Analysis/Real/Cloud/yamls/nautilus_real_cube_b1.yaml b/papers/F/Analysis/Real/Cloud/yamls/nautilus_real_cube_b1.yaml
@@ -52,7 +52,7 @@ spec:
             cd ../../..;
             cd papers/F/Analysis/Real/Cloud;
             mkdir Output;
-            python run_real_craco_block.py -s 1 -e 5;
+            python run_craco_real.py -t 41 -n 41 -s 1 -e 5;
             aws --endpoint http://rook-ceph-rgw-nautiluss3.rook s3 cp Output s3://zdm/Cubes/F/real/ --recursive --force;
         env:
           - name: "ENDPOINT_URL"

diff --git a/zdm/data/Surveys/CRAFT_ICS_1632.ecsv b/zdm/data/Surveys/CRAFT_ICS_1632.ecsv
@@ -24,5 +24,5 @@
 # schema: astropy-2.0
 TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z
 20211212A 336.0 206.0 27.1 1632.5 1.0 "" "" 12.8 9.0 4.4 1.182 2.7 closepack36/45/0.9 01:40:36.8 10:30:40.7 0.0715
-20220105A 336.0 583.0 22.0 1632.5 1.0 "" "" 9.8 9.0 4.4 1.182 2.0 "" 13:54:51.4 0.2785
-20221106A 336.0 344.0 34.8 1631.5 1.0 "" "" 35.1 9.0 4.4 1.182 5.7 "" 03:46:38.1 -1.0
+20220105A 336.0 583.0 22.0 1632.5 1.0 "" "" 9.8 9.0 4.4 1.182 2.0 "" 22:29:19.7 13:54:51.4 0.2785
+20221106A 336.0 344.0 34.8 1631.5 1.0 "" "" 35.1 9.0 4.4 1.182 5.7 "" -25:39:44.9 03:46:38.1 -1.0
diff --git a/zdm/data/Surveys/CRAFT_ICS_892.ecsv b/zdm/data/Surveys/CRAFT_ICS_892.ecsv
@@ -31,4 +31,4 @@ TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z
 20210807D 336.0 251.9 121.2 920.5 1.0 "" "" 47.1 9.0 4.4 1.182 10.0 square6x6/45/0.9 -00:45:44.5 19:56:53.144 0.12969
 20210809C 336.0 651.5 190.1 920.5 1.0 "" "" 16.8 9.0 4.4 1.182 14.2 square6x6/45/0.9 01:19:43.5 18:04:37.7 -1.0
 20211203C 336.0 636.2 63.4 920.5 1.0 "" "" 14.2 9.0 4.4 1.182 9.6 closepack36/45/0.9 -31:22:04.0 13:37:52.8 0.34386
-20220725A 336.0 290.4 30.7 920.5 1.0 "" "" 12.7 9.0 4.4 1.182 4.1 "" 23:33:32.1 0.1926
+20220725A 336.0 290.4 30.7 920.5 1.0 "" "" 12.7 9.0 4.4 1.182 4.1 "" "" 23:33:32.1 0.1926
diff --git a/zdm/real_loading.py b/zdm/real_loading.py
@@ -119,9 +119,9 @@ def surveys_and_grids(init_state=None, alpha_method=1, add_20220610A=False):
 
     ############## Initialise surveys ##############
     survey_names = ['CRAFT/FE', 
-                    'private_CRAFT_ICS_1632',
-                    'private_CRAFT_ICS_892', 
-                    'private_CRAFT_ICS_1272',
+                    'CRAFT_ICS_1632',
+                    'CRAFT_ICS_892', 
+                    'CRAFT_ICS_1272',
                     'PKS/Mb']
     if add_20220610A:
         survey_names[3] = 'CRAFT_ICS_w_220610'