Re-enable range crop #78 #100

CameronBodine · Oct 23, 2023 · 1be0831 · 1be0831
1 parent 602ee6c
commit 1be0831
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/main.py b/main.py
@@ -124,6 +124,7 @@
 pred_sub = 1 # Automatically predict substrates and save to npz: 0==False; 1==True, SegFormer Model
 pltSubClass = True # Export plots of substrate classification and predictions
 map_sub = True # Export substrate maps (as rasters). Requires substrate predictions saved to npz.
+map_predict = False # Export substrate heat maps (probabilities) for each class. Requires substrate predictions saved to npz.
 export_poly = True # Convert substrate maps to shapefile: map_sub must be > 0 or raster maps previously exported
 map_class_method = 'max' # 'max' only current option. Take argmax of substrate predictions to get final classification.
 
@@ -194,6 +195,7 @@
     'projDir':projDir,
     'tempC':tempC,
     'nchunk':nchunk,
+    'cropRange':cropRange,
     'exportUnknown':exportUnknown,
     'fixNoDat':fixNoDat,
     'threadCnt':threadCnt,

diff --git a/main_batchDirectory.py b/main_batchDirectory.py
@@ -177,6 +177,7 @@
             'projDir':projDir,
             'tempC':tempC,
             'nchunk':nchunk,
+            'cropRange':cropRange,
             'exportUnknown':exportUnknown,
             'fixNoDat':fixNoDat,
             'threadCnt':threadCnt,

diff --git a/src/main_readFiles.py b/src/main_readFiles.py
@@ -525,8 +525,9 @@ def read_master_func(logfilename='',
 
                 # Get sonMetaDF
                 son._loadSonMeta()
-                son.sonMetaDF['ping_cnt'] = d
-                son._saveSonMeta(son.sonMetaDF)
+                # son.sonMetaDF['ping_cnt'] = d
+                son.sonMetaDF.loc[son.sonMetaDF['ping_cnt'] > d, 'ping_cnt'] = d
+                son._saveSonMetaCSV(son.sonMetaDF)
 
         # Store flag to export un-rectified sonar tiles in each sonObj.
         for son in sonObjs:

diff --git a/test_PINGMapper.py b/test_PINGMapper.py
@@ -159,7 +159,7 @@
 pltSubClass = True # Export plots of substrate classification and predictions
 map_sub = 1 # Export substrate maps (as rasters): 0==False; 1==True. Requires substrate predictions saved to npz.
 export_poly = True # Convert substrate maps to shapefile: map_sub must be > 0 or raster maps previously exported
-map_predict = 0 #Export rectified tiles of the model predictions: 0==False; 1==Probabilities; 2==Logits. Requires substrate predictions saved to npz.
+map_predict = False # Export substrate heat maps (probabilities) for each class. Requires substrate predictions saved to npz.
 map_class_method = 'max' # 'max' only current option. Take argmax of substrate predictions to get final classification.
 
 
@@ -224,6 +224,7 @@
     'projDir':projDir,
     'tempC':tempC,
     'nchunk':nchunk,
+    'cropRange':cropRange,
     'exportUnknown':exportUnknown,
     'fixNoDat':fixNoDat,
     'threadCnt':threadCnt,