Merge branch 'develop' into coackley_CIFix_v09_91_02

bear-is-asleep · web-flow · commit f37b7377357f · 2024-09-16T11:36:30.000-05:00
diff --git a/sbndcode/Commissioning/HitDumper_module.cc b/sbndcode/Commissioning/HitDumper_module.cc
diff --git a/sbndcode/Commissioning/fcls/hitdumpermodule.fcl b/sbndcode/Commissioning/fcls/hitdumpermodule.fcl
@@ -7,15 +7,16 @@ hitdumper:
     MaxHits: 100000
     MaxOpHits: 100000
     MaxSamples: 5001
-    MaxCRTHits: 5000
-    MaxCRTTracks: 10
+    MaxCRTStripHits:   5000
+    MaxCRTSpacePoints: 500
+    MaxCRTTracks:      100
 
     DigitModuleLabel:         "daq"
     HitsModuleLabel:          "fasthit"
     OpHitsModuleLabel:        ["ophitpmt", "ophitxarapuca"]
-    CRTHitModuleLabel:        "crthit"
-    CRTStripModuleLabel:      "crt"
-    CRTTrackModuleLabel:      "crttrack"
+    CRTStripHitModuleLabel:   "crtstrips"
+    CRTSpacePointModuleLabel: "crtspacepoints"
+    CRTTrackModuleLabel:      "crttracks"
     pmtTriggerModuleLabel:    "pmttriggerproducer"
     pmtSoftTriggerModuleLabel:"pmtSoftwareTrigger"
     crtSoftTriggerModuleLabel:"MetricProducer"
@@ -25,12 +26,11 @@ hitdumper:
     MCTrackModuleLabel:       "mcreco"
     MCShowerModuleLabel:      "mcreco"
  
-    keepCRThits:              true
-    keepCRTstrips:            false
-    makeCRTtracks:            false
-    readCRTtracks:            true
+    KeepCRTStripHits:         true
+    KeepCRTSpacePoints:       false
+    KeepCRTTracks:            false
     readOpHits:               true
-    readpmtTrigger:	          true
+    readpmtTrigger:           true
     readpmtSoftTrigger:       true
     readcrtSoftTrigger:	      false
     readMuonTracks:           false
diff --git a/sbndcode/Commissioning/fcls/reco1_comm_muontrack_crtreco.fcl b/sbndcode/Commissioning/fcls/reco1_comm_muontrack_crtreco.fcl
@@ -0,0 +1,45 @@
+#include "muontrackmodule.fcl"
+#include "reco1_comm.fcl"
+
+physics.producers.fasthit:           @local::standard_fasthitfinder
+physics.producers.MuonTrackProducer: @local::MuonTrackProducer
+
+physics.producers.crtclustering:  @local::crtclusterproducer_sbnd
+physics.producers.crtspacepoints: @local::crtspacepointproducer_sbnd
+physics.producers.crttracks:      @local::crttrackproducer_sbnd
+
+physics.reco1comm: [ rns
+  , opdecopmt
+  , opdecoxarapuca
+  , ophitpmt
+  , ophitxarapuca
+  , crtstrips
+  , crtclustering
+  , crtspacepoints
+  , crttracks
+  , fasthit
+  , MuonTrackProducer
+ ]
+
+physics.trigger_paths: [ reco1comm ]
+
+physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
+physics.producers.fasthit.MinSigInd: 15.0
+physics.producers.fasthit.MinSigCol: 15.0
+physics.producers.fasthit.SkipInd: false
+# parameter below enlarges the window of the hit symmetrically by adding
+#  this many widths to each side.   Original window is above threshold.
+#  Both thresh and larger window in this file are appropriate only when
+#  noise is turned off.
+physics.producers.fasthit.IncludeMoreTail: 3.0
+physics.producers.fasthit.ColMinWidth: 100.0
+physics.producers.fasthit.UncompressWithPed: false
+
+# override hitdumper defaults 
+physics.analyzers.hitdumper.readMuonHits:       true
+physics.analyzers.hitdumper.readMuonTracks:     true
+physics.analyzers.hitdumper.KeepCRTStripHits:   true
+physics.analyzers.hitdumper.KeepCRTTracks:      true
+physics.analyzers.hitdumper.KeepCRTSpacePoints: true
+physics.analyzers.hitdumper.readpmtTrigger:     false
+physics.analyzers.hitdumper.readpmtSoftTrigger: false
diff --git a/sbndcode/Commissioning/fcls/run_muontrack.fcl b/sbndcode/Commissioning/fcls/run_muontrack.fcl
@@ -91,14 +91,12 @@ physics:
 }
 
 # override hitdumper defaults 
-physics.analyzers.hitdumper.keepCRThits:   false
-physics.analyzers.hitdumper.makeCRTtracks: false
-physics.analyzers.hitdumper.readCRTtracks: false
-physics.analyzers.hitdumper.readOpHits:    false
-physics.analyzers.hitdumper.readTruth:     false
-physics.analyzers.hitdumper.savePOTinfo:   false
-physics.analyzers.hitdumper.readMuonHits:  true
-physics.analyzers.hitdumper.SelectEvents:  [reco] 
+physics.analyzers.hitdumper.KeepCRTStripHits: false
+physics.analyzers.hitdumper.readOpHits:       false
+physics.analyzers.hitdumper.readTruth:        false
+physics.analyzers.hitdumper.savePOTinfo:      false
+physics.analyzers.hitdumper.readMuonHits:     true
+physics.analyzers.hitdumper.SelectEvents:     [reco]
 
 # set thresholds 
 physics.producers.fasthit.DigitModuleLabel: "simtpc2d:daq"
@@ -111,4 +109,4 @@ physics.producers.fasthit.SkipInd: false
 #  noise is turned off.
 physics.producers.fasthit.IncludeMoreTail: 3.0
 physics.producers.fasthit.ColMinWidth: 100.0
-physics.producers.fasthit.UncompressWithPed: false
+physics.producers.fasthit.UncompressWithPed: false
diff --git a/sbndcode/Commissioning/fcls/run_muontrack_crtreco.fcl b/sbndcode/Commissioning/fcls/run_muontrack_crtreco.fcl
@@ -0,0 +1,21 @@
+#include "crtrecoproducers_sbnd.fcl"
+#include "run_muontrack.fcl"
+
+physics.producers.crtclustering:  @local::crtclusterproducer_sbnd
+physics.producers.crtspacepoints: @local::crtspacepointproducer_sbnd
+physics.producers.crttracks:      @local::crttrackproducer_sbnd
+
+physics.reco: [ fasthit, MuonTrackProducer, MuonTrackFilter, crtclustering, crtspacepoints, crttracks ]
+physics.ana:  [ hitdumper ]
+
+# override hitdumper defaults 
+physics.analyzers.hitdumper.readMuonHits:       true
+physics.analyzers.hitdumper.readMuonTracks:     true
+physics.analyzers.hitdumper.KeepCRTStripHits:   true
+physics.analyzers.hitdumper.KeepCRTTracks:      true
+physics.analyzers.hitdumper.KeepCRTSpacePoints: true
+physics.analyzers.hitdumper.readpmtTrigger:     false
+physics.analyzers.hitdumper.readpmtSoftTrigger: false
+physics.analyzers.hitdumper.readOpHits:         true
+physics.analyzers.hitdumper.readTruth:          true
+physics.analyzers.hitdumper.savePOTinfo:        true
diff --git a/sbndcode/Utilities/detectorproperties_sbnd.fcl b/sbndcode/Utilities/detectorproperties_sbnd.fcl
@@ -5,7 +5,7 @@ BEGIN_PROLOG
 sbnd_detproperties:                   @local::standard_detproperties
 sbnd_detproperties.Temperature:       88.4  # measured in ArgoNeut (MicroBooNE measured 89K, arXiv:1910.01430)
 sbnd_detproperties.Efield:           [0.5,0.666,0.8]  #reasonable values 
-sbnd_detproperties.Electronlifetime:  10.0e3  # microseconds
+sbnd_detproperties.Electronlifetime:  100.0e3  # microseconds
 sbnd_detproperties.ElectronsToADC:    6.29778e-3 
 sbnd_detproperties.TimeOffsetU:       0.
 sbnd_detproperties.TimeOffsetV:       0.
diff --git a/sbndcode/WireCell/wcsimsp_sbnd.fcl b/sbndcode/WireCell/wcsimsp_sbnd.fcl
@@ -65,7 +65,7 @@ sbnd_wcls_simsp.wcls_main.structs:  {
                                      ## Transverse diffusion constant [cm2/s]
                                      DT: 8.8
                                      ## Electron lifetime [ms]
-                                     lifetime: 10.0
+                                     lifetime: 100.0
                                      ## Electron drift speed, assumes 0.5 kV/cm and 88.4 K. Units: mm/us
                                      driftSpeed: 1.563
                                     }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ sbnd_wcls_simsp.wcls_main.structs: {`
`65`	`65`	`## Transverse diffusion constant [cm2/s]`
`66`	`66`	`DT: 8.8`
`67`	`67`	`## Electron lifetime [ms]`
`68`		`- lifetime: 10.0`
	`68`	`+ lifetime: 100.0`
`69`	`69`	`## Electron drift speed, assumes 0.5 kV/cm and 88.4 K. Units: mm/us`
`70`	`70`	`driftSpeed: 1.563`
`71`	`71`	`}`