config clean-up, merged Sindhu's additions

DeepLearnPhysics · Aug 29, 2024 · 34eeed1 · 34eeed1
1 parent 1ad6484
commit 34eeed1
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 48 deletions.
diff --git a/src/flow2supera/config_data/2x2.yaml b/src/flow2supera/config_data/2x2.yaml
@@ -2,13 +2,16 @@
 # 2x2.yaml
 # ===============
 
-LogLevel:        INFO
+SuperaDriver:
+    LogLevel: WARNING
+    AssertInOutVoxelCount: True
+
+Flow2Supera:
     PropertyConfig:
         ParserConfigKeyword: '2x2'
         SimConfigKeyword:    '2x2'
         TileLayout: ''
         DetectorProperties: ''
-
     #
     # flow2supera.Driver configuration
     #
@@ -26,26 +29,11 @@ BBoxAlgorithm: BBoxInteraction
 BBoxConfig:
     LogLevel:   WARNING
     Seed:       -1
-    # MR3(?):
-    # BBoxSize:   [141.888,127.6992,141.888]
-    # BBoxTop:    [70.944,105.8496,70.944]
-    # BBoxBottom: [-70.944,-21.8496,-70.944]
-    #BBoxSize:   [129.0,  127.0, 131.0]
-    #BBoxTop:    [64.5,  -203.0, 1365.5]
-    #BBoxBottom: [-64.5, -330.0, 1234.5]
-
-    #taken from larnd2supera for MR4
-    #BBoxSize:   [141.888,127.6992,141.888]
-    #BBoxTop:    [70.944,-204.1504,1370.944]
-    #BBoxBottom: [-70.944,-331.8496,1229.056]
-    # MR4.5, MR5:
+
     BBoxSize:   [141.888,127.6992,141.888]
     BBoxTop:    [70.944,63.8496,70.944]
     BBoxBottom: [-70.944,-63.8496,-70.944]
-    # NOTE: The VoxelSize will vary by module for MR5
     VoxelSize:  [0.4434,0.4434,0.4434]
-    #WorldBoundMax: [-1.e20,-1.e20,-1.e20]
-    #WorldBoundMin: [ 1.e20, 1.e20, 1.e20]
 
 LabelAlgorithm: LArTPCMLReco3D
 LabelConfig:
@@ -61,4 +49,5 @@ LabelConfig:
     SemanticPriority: [1,0,2,3,4]
     EnergyDepositThreshold: 0.0
     RewriteInteractionID:  False
+    MergeUnassociatedEDeps: True
 
diff --git a/src/flow2supera/config_data/2x2_data.yaml b/src/flow2supera/config_data/2x2_data.yaml
@@ -2,41 +2,28 @@
 # 2x2.yaml
 # ===============
 
-LogLevel:        INFO
+SuperaDriver:
+    LogLevel: WARNING
+    AssertInOutVoxelCount: False
+
 Flow2Supera:
     PropertyConfig:
         ParserConfigKeyword: '2x2'
         SimConfigKeyword:    '2x2'
         TileLayout: ''
         DetectorProperties: ''
 
-    ElectronEnergyThreshold: 5
     DataType: ['data', '']
 
 BBoxAlgorithm: BBoxInteraction
 BBoxConfig:
     LogLevel:   WARNING
     Seed:       -1
-    # MR3(?):
-    # BBoxSize:   [141.888,127.6992,141.888]
-    # BBoxTop:    [70.944,105.8496,70.944]
-    # BBoxBottom: [-70.944,-21.8496,-70.944]
-    #BBoxSize:   [129.0,  127.0, 131.0]
-    #BBoxTop:    [64.5,  -203.0, 1365.5]
-    #BBoxBottom: [-64.5, -330.0, 1234.5]
-
-    #taken from larnd2supera for MR4
-    #BBoxSize:   [141.888,127.6992,141.888]
-    #BBoxTop:    [70.944,-204.1504,1370.944]
-    #BBoxBottom: [-70.944,-331.8496,1229.056]
-    # MR4.5, MR5:
+
     BBoxSize:   [141.888,127.6992,141.888]
     BBoxTop:    [70.944,63.8496,70.944]
     BBoxBottom: [-70.944,-63.8496,-70.944]
-    # NOTE: The VoxelSize will vary by module for MR5
     VoxelSize:  [0.4434,0.4434,0.4434]
-    #WorldBoundMax: [-1.e20,-1.e20,-1.e20]
-    #WorldBoundMin: [ 1.e20, 1.e20, 1.e20]
 
 LabelAlgorithm: LArTPCMLReco3D
 LabelConfig:
@@ -52,3 +39,4 @@ LabelConfig:
     SemanticPriority: [1,0,2,3,4]
     EnergyDepositThreshold: 0.0
     RewriteInteractionID:  False
+    MergeUnassociatedEDeps: True
diff --git a/src/flow2supera/config_data/2x2_mpvmpr.yaml b/src/flow2supera/config_data/2x2_mpvmpr.yaml
@@ -1,8 +1,10 @@
 # ===============
-# 2x2.yaml
+# 2x2_mpvmpr.yaml
 # ===============
 
-LogLevel:        WARNING
+SuperaDriver:
+    LogLevel: WARNING
+    AssertInOutVoxelCount: True
 
 Flow2Supera:
     PropertyConfig:
@@ -23,24 +25,16 @@ Flow2Supera:
     DBSCANParticleCluster: True
     DBSCANUnassociatedEDeps: True
 
-
 BBoxAlgorithm: BBoxInteraction
 BBoxConfig:
     LogLevel:   WARNING
     Seed:       -1
-    # MR4.5, MR5:
+
     BBoxSize:   [141.888,127.6992,141.888]
     BBoxTop:    [70.944,63.8496,70.944]
     BBoxBottom: [-70.944,-63.8496,-70.944]
     VoxelSize:  [0.4434,0.4434,0.4434]
 
-    #BBoxSize:   [ 720.0, 350.0, 570.0]
-    #BBoxTop:    [ 360.0, 100.0, 950.0]
-    #BBoxBottom: [-360.0,-250.0, 380.0]
-    #VoxelSize:  [0.4434,0.4434,0.4434]
-
-
-
 LabelAlgorithm: LArTPCMLReco3D
 LabelConfig:
     #

diff --git a/src/flow2supera/config_data/ndlar_beam.yaml b/src/flow2supera/config_data/ndlar_beam.yaml
@@ -0,0 +1,52 @@
+# ===============
+# 2x2_mpvmpr.yaml
+# ===============
+
+SuperaDriver:
+    LogLevel: WARNING
+    AssertInOutVoxelCount: True
+
+Flow2Supera:
+    PropertyConfig:
+        ParserConfigKeyword: 'ndlar'
+        SimConfigKeyword:    'ndlar'
+        TileLayout: ''
+        DetectorProperties: ''
+    #
+    # flow2supera.Driver configuration
+    #
+    AssChargeLimit: 0.09
+    AssFractionLimit: 0.1
+    ElectronEnergyThreshold: 0
+    DataType: ['sim', 'neutrino']
+    ClusterSizeLimit: 5
+    DBSCANDist: 0.882366 # 1.99 * 0.4434
+    DBSCANNjobs: 1 # -1 = all cores, but 1 may be faster
+    DBSCANParticleCluster: True
+    DBSCANUnassociatedEDeps: True
+
+BBoxAlgorithm: BBoxInteraction
+BBoxConfig:
+    LogLevel:   WARNING
+    Seed:       -1
+
+    BBoxSize:   [ 720.0, 350.0, 570.0]
+    BBoxTop:    [ 360.0, 100.0, 950.0]
+    BBoxBottom: [-360.0,-250.0, 380.0]
+    VoxelSize:  [0.4434,0.4434,0.4434]
+
+LabelAlgorithm: LArTPCMLReco3D
+LabelConfig:
+    #
+    # SuperaAtomic::Driver configuration
+    #
+    LogLevel: WARNING
+    DeltaSize:    10
+    ComptonSize:  10
+    LEScatterSize: 5
+    TouchDistance: 1
+    StoreLEScatter:   True
+    SemanticPriority: [1,0,2,3,4]
+    EnergyDepositThreshold: 0.0
+    RewriteInteractionID:  False
+    MergeUnassociatedEDeps: True
diff --git a/src/flow2supera/utils.py b/src/flow2supera/utils.py
@@ -377,7 +377,7 @@ def run_supera(out_file='larcv.root',
     end_time = time.time()
 
     print("\n----- [run_suera] finished -----\n")
-    print("[run_supera] Total processing time in s: ", end_time-start_time)
+    print("[run_supera] Total processing time in s: ", end_time-start_time,'\n')