Merge branch 'release/v09_90_00'

Author: Brinden Carlson

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.90.00)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.88.00.02)
+# project(sbndcode VERSION 09.90.00)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")
@@ -88,6 +88,11 @@ find_package( Geant4 REQUIRED )
 find_package( Boost COMPONENTS system REQUIRED )
 find_package( ROOT REQUIRED )
 
+if(DEFINED ENV{HEP_HPC_DIR} )
+  find_ups_product( hdf5 )
+  find_ups_product( hep_hpc )
+endif()
+
 # macros for dictionary and simple_plugin
 include(ArtDictionary)
 include(ArtMake)

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/ChannelMaps/TPC/TPCChannelMapService_service.cc

@@ -75,6 +75,7 @@ SBND::TPCChannelMapService::TPCChannelMapService(fhicl::ParameterSet const& pset
       if (planestr == "Y") c.plane = 2;
       if (c.plane == 10) c.valid = false;
       c.WIBQFSP = atoi(qfspstr.substr(3,1).c_str());
+      c.asicchan = c.FEMBCh % 16;
 
       fChanInfoFromFEMInfo[c.FEMCrate][c.FEM][c.FEMCh] = c;
       fChanInfoFromOfflChan[c.offlchan] = c;

sbndcode/Commissioning/CMakeLists.txt

@@ -39,6 +39,9 @@ set(
         sbndcode_RecoUtils
         sbndcode_OpDetSim
         sbndcode_GeoWrappers
+        sbndcode_ChannelMaps_TPC_TPCChannelMapService_service
+        hep_hpc_hdf5
+        ${HDF5_LIBRARIES}
 )