Merge pull request #459 from SBNSoftware/release/SBN2024A

SBN2024A to develop

Author: fjnicolas

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.88.00.02)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.88.00.03)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.88.00.02)
+# project(sbndcode VERSION 09.88.00.03)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/CRT/CRTReco/CRTClusterCharacterisationAlg.cc

@@ -10,9 +10,7 @@ namespace sbnd::crt {
     , fPEAttenuation(pset.get<double>("PEAttenuation"))
     , fPropDelay(pset.get<double>("PropDelay"))
     , fTimeWalkNorm(pset.get<double>("TimeWalkNorm"))
-    , fTimeWalkShift(pset.get<double>("TimeWalkShift"))
-    , fTimeWalkSigma(pset.get<double>("TimeWalkSigma"))
-    , fTimeWalkOffset(pset.get<double>("TimeWalkOffset"))
+    , fTimeWalkScale(pset.get<double>("TimeWalkScale"))
   {
   }
 
@@ -221,7 +219,10 @@ namespace sbnd::crt {
 
   double CRTClusterCharacterisationAlg::TimingCorrectionOffset(const double &dist, const double &pe)
   {
-    return dist * fPropDelay + fTimeWalkNorm * std::exp(-0.5 * std::pow((pe - fTimeWalkShift) / fTimeWalkSigma, 2)) + fTimeWalkOffset;
+
+    double t_TimeWalk  = fTimeWalkNorm * std::exp(- fTimeWalkScale * pe);
+    double t_PropDelay = fPropDelay * dist;
+    return t_PropDelay + t_TimeWalk;
   }
 
   void CRTClusterCharacterisationAlg::AggregatePositions(const std::vector<CRTSpacePoint> &complete_spacepoints, geo::Point_t &pos, geo::Point_t &err)

sbndcode/CRT/CRTReco/CRTClusterCharacterisationAlg.h

@@ -83,9 +83,7 @@ namespace sbnd::crt {
     double fPEAttenuation;
     double fPropDelay;
     double fTimeWalkNorm;
-    double fTimeWalkShift;
-    double fTimeWalkSigma;
-    double fTimeWalkOffset;
+    double fTimeWalkScale;
   };
 }
 

sbndcode/CRT/CRTReco/crtrecoproducers_sbnd.fcl

@@ -26,9 +26,7 @@ crtclustercharacterisationalg_sbnd:
    PEAttenuation:  @local::sbnd_crtsim.DetSimParams.NpeScaleShift
    PropDelay:      @local::sbnd_crtsim.DetSimParams.PropDelay
    TimeWalkNorm:   @local::sbnd_crtsim.DetSimParams.TDelayNorm
-   TimeWalkShift:  @local::sbnd_crtsim.DetSimParams.TDelayShift
-   TimeWalkSigma:  @local::sbnd_crtsim.DetSimParams.TDelaySigma
-   TimeWalkOffset: @local::sbnd_crtsim.DetSimParams.TDelayOffset
+   TimeWalkScale:  @local::sbnd_crtsim.DetSimParams.TDelayScale
 }
 
 crtspacepointproducer_sbnd:

sbndcode/CRT/CRTSimulation/CRTDetSimAlg.cxx

@@ -561,20 +561,18 @@ namespace crt {
     {
         // Hit timing, with smearing and NPE dependence
         double tDelayMean =
-          fParams.TDelayNorm() *
-            exp(-0.5 * pow((npeMean - fParams.TDelayShift()) / fParams.TDelaySigma(), 2)) +
-          fParams.TDelayOffset();
+            fParams.TDelayNorm() * exp(-fParams.TDelayScale()*npeMean);
 
         double tDelayRMS =
-          fParams.TDelayRMSGausNorm() *
+            fParams.TDelayRMSGausNorm() *
             exp(-pow(npeMean - fParams.TDelayRMSGausShift(), 2) / fParams.TDelayRMSGausSigma()) +
-          fParams.TDelayRMSExpNorm() *
-            exp(-(npeMean - fParams.TDelayRMSExpShift()) / fParams.TDelayRMSExpScale());
+            exp(-(npeMean - fParams.TDelayRMSExpShift()) / fParams.TDelayRMSExpScale()) + fParams.TDelayRMSOffSetSlope()*r+ fParams.TDelayRMSOffSet();
 
         double tDelay = CLHEP::RandGauss::shoot(&fEngine, tDelayMean, tDelayRMS);
 
         // Time resolution of the interpolator
-        tDelay += CLHEP::RandGauss::shoot(&fEngine, 0, fParams.TResInterpolator());
+        // comments: we should have a simulation for interpolator, but definitely not further smearing our timing resolution
+        // tDelay += CLHEP::RandGauss::shoot(&fEngine, 0, fParams.TResInterpolator());
 
         // Propagation time
         double tProp = CLHEP::RandGauss::shoot(fParams.PropDelay(), fParams.PropDelayError()) * r;

sbndcode/CRT/CRTSimulation/CRTDetSimParams.h

@@ -34,19 +34,11 @@ namespace crt
     };
     fhicl::Atom<double> TDelayNorm {
       fhicl::Name("TDelayNorm"),
-      fhicl::Comment("Time delay fit: Gaussian normalization"),
+      fhicl::Comment("Time delay fit: Exponential normalization"),
     };
-    fhicl::Atom<double> TDelayShift {
-      fhicl::Name("TDelayShift"),
-      fhicl::Comment("Time delay fit: Gaussian x shift"),
-    };
-    fhicl::Atom<double> TDelaySigma {
-      fhicl::Name("TDelaySigma"),
-      fhicl::Comment("Time delay fit: Gaussian width"),
-    };
-    fhicl::Atom<double> TDelayOffset {
-      fhicl::Name("TDelayOffset"),
-      fhicl::Comment("Time delay fit: Gaussian baseline offset"),
+    fhicl::Atom<double> TDelayScale {
+      fhicl::Name("TDelayScale"),
+      fhicl::Comment("Time delay fit: Exponential x scale"),
     };
     fhicl::Atom<double> TDelayRMSGausNorm {
       fhicl::Name("TDelayRMSGausNorm"),
@@ -60,10 +52,6 @@ namespace crt
       fhicl::Name("TDelayRMSGausSigma"),
       fhicl::Comment("Time delay fit: Gaussian width"),
     };
-    fhicl::Atom<double> TDelayRMSExpNorm {
-      fhicl::Name("TDelayRMSExpNorm"),
-      fhicl::Comment("Time delay RMS fit: Exponential normalization"),
-    };
     fhicl::Atom<double> TDelayRMSExpShift {
       fhicl::Name("TDelayRMSExpShift"),
       fhicl::Comment("Time delay RMS fit: Exponential x shift"),
@@ -72,6 +60,14 @@ namespace crt
       fhicl::Name("TDelayRMSExpScale"),
       fhicl::Comment("Time delay RMS fit: Exponential scale"),
     };
+    fhicl::Atom<double> TDelayRMSOffSetSlope {
+      fhicl::Name("TDelayRMSOffSetSlope"),
+      fhicl::Comment("Time delay RMS fit: Offset slope"),
+    };
+    fhicl::Atom<double> TDelayRMSOffSet {
+      fhicl::Name("TDelayRMSOffSet"),
+      fhicl::Comment("Time delay RMS fit: Offset"),
+    };
     fhicl::Atom<uint32_t> TriggerDelay {
       fhicl::Name("TriggerDelay"),
       fhicl::Comment("Time between signal starts and waveform goes above threshold"),

sbndcode/CRT/CRTSimulation/crtsimmodules_sbnd.fcl

@@ -7,18 +7,17 @@ standard_sbnd_crtsimparams: {
   UseG4RefTimeOffset: true
 
   # Shape parameters for mean time delay vs. Npe
-  TDelayNorm: 4125.74
-  TDelayShift: -300.31
-  TDelaySigma: 90.392
-  TDelayOffset: -1.525
+  TDelayNorm: 15.455
+  TDelayScale: 0.055
 
   # Shape parameters for time delay RMS vs. Npe
-  TDelayRMSGausNorm: 2.09138
-  TDelayRMSGausShift: 7.23993
-  TDelayRMSGausSigma: 170.027
-  TDelayRMSExpNorm: 1.6544
-  TDelayRMSExpShift: 75.6183
-  TDelayRMSExpScale: 79.3543
+  TDelayRMSGausNorm: 2.01522  
+  TDelayRMSGausShift: 10.3433 
+  TDelayRMSGausSigma: 68.8702
+  TDelayRMSExpShift: 1137.51
+  TDelayRMSExpScale: 416.158 
+  TDelayRMSOffSetSlope: 1.37e-3 
+  TDelayRMSOffSet: -11.7338
 
   TriggerDelay: 10 # ns
 
@@ -39,7 +38,7 @@ standard_sbnd_crtsimparams: {
 
   # Mean deposited charge for mips [GeV]
   UseEdep: true
-  Q0: 1.75e-3
+  Q0: 1.53e-3
 
   # ADC model: Pedestal offset [ADC], slope [ADC/photon], RMS [ADC]
   QPed: 0.0 #63.6

sbndcode/Decoders/PMT/PMT_to_Digitizers.txt

@@ -1,4 +1,4 @@
-PMT Simulation ID	PMT Installation ID	Breakout Board # (1=Curly, 2=Larry, 3=Moe)	Slot (0-47)	DIGITIZER (1-8)	CHANNEL (0-14)	Warm Cable Transit (ns)	PMT to BB Delay (ns)	PMT to BB Transit (ns)	BB to Digitizer Delay (ns)	BB to Digitizer Transit (ns)	Total Transit (ns)
+PMT Simulation ID	PMT Installation ID	Breakout Board 	Slot (0-47) 	DIGITIZER (1-8)	CHANNEL (0-14)	Warm Cable Transit (ns)	PMT to BB Delay (ns)	PMT to BB Transit (ns)	BB to Digitizer Delay (ns)	BB to Digitizer Transit (ns)	Total Transit (ns)]
 17	A13	1	5	1	0	112.5	3.4	144.4	-0.08	7.32	151.7
 71	A11	1	17	1	1	108.9	-0.4	140.6	-0.1	7.3	147.9
 41	A22	1	29	1	2	111.1	1.8	142.8	-0.06	7.34	150.1
@@ -26,7 +26,7 @@ PMT Simulation ID	PMT Installation ID	Breakout Board # (1=Curly, 2=Larry, 3=Moe)
 10	W31	2	20	2	9	111.7	2.35	143.35	-0.1	7.3	150.7
 8	X11	2	32	2	10	109.1	10.3	151.3	-0.08	7.32	158.6
 62	X13	2	44	2	11	109.7	4.05	145.05	0.0	7.4	152.5
-46	X22	3	8	2	12	104.1	-0.35	140.65	-0.1	7.3	148.0
+36	X22	3	8	2	12	104.1	-0.35	140.65	-0.1	7.3	148.0
 6	X31	3	20	2	13	107.1	3.05	144.05	-0.06	7.34	151.4
 60	X33	3	32	2	14	105.1	3.85	144.85	0.0	7.4	152.3
 95	D13	1	9	3	0	110.7	1.0	142.0	0.0	7.4	149.4
@@ -77,7 +77,7 @@ PMT Simulation ID	PMT Installation ID	Breakout Board # (1=Curly, 2=Larry, 3=Moe)
 195	H22	1	2	6	0	105.9	-3.9	137.1	-0.14	7.26	144.4
 167	H33	1	14	6	1	108.7	-0.95	140.05	-0.12	7.28	147.3
 165	I13	1	26	6	2	107.9	-1.9	139.1	-0.1	7.3	146.4
-19	I11	1	38	6	3	110.7	1.25	142.25	0.0	7.4	149.7
+219	I11	1	38	6	3	110.7	1.25	142.25	0.0	7.4	149.7
 193	I22	2	1	6	4	111.5	1.7	142.7	0.0	7.4	150.1
 163	I33	2	13	6	5	107.7	-1.3	139.7	-0.1	7.3	147.0
 217	I31	2	25	6	6	107.9	-1.15	139.85	-0.12	7.28	147.1
@@ -102,7 +102,7 @@ PMT Simulation ID	PMT Installation ID	Breakout Board # (1=Curly, 2=Larry, 3=Moe)
 274	M22	2	27	7	10	105.7	-4.0	137.0	-0.1	7.3	144.3
 248	M31	2	39	7	11	109.5	-0.25	140.75	0.0	7.4	148.2
 302	M33	3	3	7	12	104.7	-5.4	135.6	-0.14	7.26	142.9
-247	N11	3	15	7	13	106.5	-3.1	137.9	-0.08	7.32	145.2
+246	N11	3	15	7	13	106.5	-3.1	137.9	-0.08	7.32	145.2
 300	N13	3	27	7	14	106.1	-3.55	137.45	-0.08	7.32	144.8
 273	K22	1	6	8	0	110.1	0.35	141.35	-0.14	7.26	148.6
 245	K33	1	18	8	1	107.9	-1.55	139.45	-0.2	7.2	146.7
@@ -116,6 +116,6 @@ PMT Simulation ID	PMT Installation ID	Breakout Board # (1=Curly, 2=Larry, 3=Moe)
 244	N31	2	19	8	9	106.9	-3.1	137.9	-0.12	7.28	145.2
 242	O11	2	31	8	10	105.9	-3.7	137.3	-0.1	7.3	144.6
 296	O13	2	43	8	11	109.7	0.0	141.0	0.0	7.4	148.4
-70	O22	3	6	8	12	109.3	-0.6	140.4	-0.16	7.24	147.6
+270	O22	3	6	8	12	109.3	-0.6	140.4	-0.16	7.24	147.6
 240	O31	3	18	8	13	107.9	-1.8	139.2	0.0	7.4	146.6
 294	O33	3	30	8	14	109.5	0.0	141.0	-0.1	7.3	148.3