Silicon planar realistic digitization for varying sensor thicknesses with multilple scattering and realistic timing smearing implementation

CMakeLists.txt

@@ -16,7 +16,6 @@ SET( ${PROJECT_NAME}_VERSION_PATCH 0 )
 
 set(PACKAGE_INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
 set(PACKAGE_INSTALL_INC_DIR include CACHE PATH "Installation directory for headers")
-option(ZSEGMENTED "Sensitives are segmented along z" ON)
 
 ### DEPENDENCIES ############################################################
 
@@ -66,10 +65,6 @@ ENDIF()
 
 # definitions to pass to the compiler
 ADD_DEFINITIONS( "-Wno-long-long -Wno-effc++ -Wno-unused-parameter -Wno-narrowing" )
-if( ZSEGMENTED )
-    message ( STATUS "Enabled sensor segmentation" )
-    add_compile_definitions( "ZSEGMENTED" )
-endif()
 
 # include directories
 INCLUDE_DIRECTORIES( ./include )

include/DetElemSlidingWindow.h

@@ -44,7 +44,9 @@ class DetElemSlidingWindow
                          double electronicNoise,
                          double maxTrkLen,
                          double maxEnergyDelta,
-                         const SurfaceMap* s_map);
+                         const SurfaceMap* s_map,
+                         bool zSegmented,
+                         bool isBarrel);
     virtual ~DetElemSlidingWindow();
     bool active();
     int process();
@@ -75,6 +77,8 @@ class DetElemSlidingWindow
     const SurfaceMap* surf_map;
     CellIDDecoder<SimTrackerHit> cell_decoder;
     G4UniversalFluctuation* _fluctuate;
+    bool _zSegmented;
+    bool _isBarrel;
 };
 
 

include/MuonCVXDDigitiser.h

@@ -95,6 +95,24 @@ typedef std::vector<SignalPoint> SignalPointVec;
  * (default parameter value : 100) <br>
   * @param MaxTrackLength Maximum values for track path length inside the ladder (in mm)", <br>
  * (default parameter value : 10) <br> 
+ * @param DoMultipleScattering Flag to enable multiple scattering of the track inside the sensor <br>
+ * (default parameter value : 0) <br>
+ * @param ZSegmented flag to enable Z-segmentation for barrel layers <br>
+ * (default parameter value : false) <br>
+ * @param SigmaLandau override for Landau sigma <br>
+ * (default parameter value : -1) <br>
+ * @param SigmaTimewalk override for timewalk sigma <br>
+ * (default parameter value : -1) <br>
+ * @param SigmaJitter override for jitter sigma <br>
+ * (default parameter value : -1) <br>
+ * @param SigmaTDC override for TDC sigma <br>
+ * (default parameter value : -1) <br>
+ * @param SigmaClock override for clock sigma <br>
+ * (default parameter value : -1) <br>
+ * @param TRise override for rise time <br>
+ * (default parameter value : -1) <br>
+ * @param LayerIDs list of layer IDs to process <br>
+ * (default parameter value : empty) <br>
  * <br>
  */
 class MuonCVXDDigitiser : public Processor
@@ -104,6 +122,7 @@ class MuonCVXDDigitiser : public Processor
     virtual Processor*  newProcessor() { return new MuonCVXDDigitiser ; }
 
     MuonCVXDDigitiser();
+    ~MuonCVXDDigitiser();
 
     /** Called at the begin of the job before anything is read.
     * Use to initialize the processor, e.g. book histograms.
@@ -168,19 +187,25 @@ class MuonCVXDDigitiser : public Processor
     double _timeSmearingSigma;
     int _electronicEffects;
     int _produceFullPattern;
+    int _doMultipleScattering;
     std::vector<int> _layerIDs;
-
-    MyG4UniversalFluctuationForSi *_fluctuate;
 
+    // time digitization overrides
+    double _t_riseOverride;
+    double _sigma_landauOverride;
+    double _sigma_timewalkOverride;
+    double _sigma_jitterOverride;
+    double _sigma_TDCOverride;
+    double _sigma_clockOverride;
+
     // charge discretization
     std::vector<double> _DigitizedBins{};
 
     // geometry
     int _numberOfLayers;
     std::vector<int>   _laddersInLayer{};
-#ifdef ZSEGMENTED
+    bool _zSegmented;
     std::vector<int>   _sensorsPerLadder{};
-#endif
     std::vector<float> _layerRadius{};
     std::vector<float> _layerThickness{};
     std::vector<float> _layerHalfThickness{};
@@ -211,6 +236,7 @@ class MuonCVXDDigitiser : public Processor
     double _currentExitPoint[3];
     IonisationPointVec _ionisationPoints;
     SignalPointVec _signalPoints;
+    MyG4UniversalFluctuationForSi *_fluctuate;
 
     /* Charge digitization helpers */
     void ProduceIonisationPoints(SimTrackerHit *hit);

include/MuonCVXDRealDigitiser.h

@@ -153,6 +153,8 @@ class MuonCVXDRealDigitiser : public Processor
     int _electronicEffects;
     int _produceFullPattern;
     int sensor_type;
+    bool _zSegmented;
+    bool _isBarrel;
 
     // geometry
     int _numberOfLayers;

src/DetElemSlidingWindow.cc

@@ -40,7 +40,9 @@ DetElemSlidingWindow::DetElemSlidingWindow(HitTemporalIndexes& htable,
                                            double electronicNoise,
                                            double maxTrkLen,
                                            double maxEnergyDelta,
-                                           const SurfaceMap* s_map):
+                                           const SurfaceMap* s_map,
+                                           bool zSegmented,
+                                           bool isBarrel):
     curr_time(starttime + wsize / 2),  // window centered in the middle
     time_click(wsize),
     _htable(htable),
@@ -58,6 +60,8 @@ DetElemSlidingWindow::DetElemSlidingWindow(HitTemporalIndexes& htable,
     _deltaEne(maxEnergyDelta),
     signals(),
     surf_map(s_map),
+    _zSegmented(zSegmented),
+    _isBarrel(isBarrel),
     cell_decoder(sensor.GetCellIDFormatStr())
 {
     _fluctuate = new G4UniversalFluctuation();
@@ -231,14 +235,14 @@ void DetElemSlidingWindow::StoreSignalPoints(SimTrackerHit* hit)
     // Store local position in mm
     pos[0] = lv[0] / dd4hep::mm;
     pos[1] = lv[1] / dd4hep::mm;
-#ifdef ZSEGMENTED
+if (_isBarrel && _zSegmented) {
     // See MuonCVXDDigitiser::processEvent
     int segment_id = cell_decoder(hit)["sensor"];
 
     float s_offset = _sensor.GetSensorCols() * _sensor.GetPixelSizeY() * (float(segment_id) + 0.5);
     s_offset -= _sensor.GetHalfLength();
     pos[1] += s_offset;
-#endif
+}
 
     // Add also z ccordinate
     Vector3D origin( surf->origin()[0], surf->origin()[1], surf->origin()[2]);