Merge pull request #264 from eic/backward_hcal_endcap

Changes from issue #251
eic · Oct 21, 2022 · ae792d6 · ae792d6
2 parents bd51e88 + 763b827
commit ae792d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h b/src/detectors/HCAL/CalorimeterHit_factory_HcalEndcapNRecHits.h
@@ -25,8 +25,8 @@ class CalorimeterHit_factory_HcalEndcapNRecHits : public JFactoryT<edm4eic::Calo
         m_input_tag = "HcalEndcapNRawHits";
 
         // digitization settings, must be consistent with digi class
-        m_capADC=8096;//{this, "capacityADC", 8096};
-        m_dyRangeADC=100. * MeV;//{this, "dynamicRangeADC", 100. * MeV};
+        m_capADC=1024;//{this, "capacityADC", 8096};
+        m_dyRangeADC=3.6 * MeV;//{this, "dynamicRangeADC", 100. * MeV};
         m_pedMeanADC=400;//{this, "pedestalMean", 400};
         m_pedSigmaADC=3.2;//{this, "pedestalSigma", 3.2};
         m_resolutionTDC=10 * dd4hep::picosecond;//{this, "resolutionTDC", 10 * ps};

diff --git a/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h b/src/detectors/HCAL/RawCalorimeterHit_factory_HcalEndcapNRawHits.h
@@ -39,8 +39,8 @@ class RawCalorimeterHit_factory_HcalEndcapNRawHits : public JFactoryT<edm4hep::R
         m_input_tag = "HcalEndcapNHits";
         u_eRes = {};
         m_tRes = 0.0 * ns;
-        m_capADC = 8096;
-        m_dyRangeADC = 100 * MeV;
+        m_capADC = 1024;
+        m_dyRangeADC = 3.6 * MeV;
         m_pedMeanADC = 400;
         m_pedSigmaADC = 3.2;
         m_resolutionTDC = 10 * picosecond;

diff --git a/src/tools/default_flags_table/reco_flags.py b/src/tools/default_flags_table/reco_flags.py
@@ -432,8 +432,8 @@
 
     # HCAL Negative endcap
     # --------------------
-    ('HCAL:HcalEndcapNRawHits:capacityADC',                      'capacityBitsADC=8',              '*'),
-    ('HCAL:HcalEndcapNRawHits:dynamicRangeADC',                  '20*MeV',                            '*'),
+    ('HCAL:HcalEndcapNRawHits:capacityADC',                      'capacityBitsADC=10',             '*'),
+    ('HCAL:HcalEndcapNRawHits:dynamicRangeADC',                  '3.6*MeV',                            '*'),
     ('HCAL:HcalEndcapNRawHits:energyResolutions',                '',                               ''),
     ('HCAL:HcalEndcapNRawHits:fieldRefNumbers',                  '',                               ''),
     ('HCAL:HcalEndcapNRawHits:geoServiceName',                   'ActsGeometryProvider',           ''),
@@ -445,8 +445,8 @@
     ('HCAL:HcalEndcapNRawHits:signalSumFields',                  '',                               ''),
     ('HCAL:HcalEndcapNRawHits:timeResolution',                   '0',                              ''),
 
-    ('HCAL:HcalEndcapNRecHits:capacityADC',                      'capacityBitsADC=8',              '*'),
-    ('HCAL:HcalEndcapNRecHits:dynamicRangeADC',                  '20*MeV',                            '*'),
+    ('HCAL:HcalEndcapNRecHits:capacityADC',                      'capacityBitsADC=10',             '*'),
+    ('HCAL:HcalEndcapNRecHits:dynamicRangeADC',                  '3.6*MeV',                            '*'),
     ('HCAL:HcalEndcapNRecHits:geoServiceName',                   'geoServiceName',                 ''),
     ('HCAL:HcalEndcapNRecHits:layerField',                       '',                               ''),
     ('HCAL:HcalEndcapNRecHits:localDetElement',                  '',                               ''),