Take suggestion from Carl

cms-sw · Dec 22, 2020 · 1f253c9 · 1f253c9
1 parent 0264a0c
commit 1f253c9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/...ecNumbering/hfshower/hcalRecNumbering.xml → ...umbering/hfshower/v1/hcalRecNumbering.xml b/...ecNumbering/hfshower/hcalRecNumbering.xml → ...umbering/hfshower/v1/hcalRecNumbering.xml
diff --git a/...imNumbering/hfshower/hcalSimNumbering.xml → ...umbering/hfshower/v1/hcalSimNumbering.xml b/...imNumbering/hfshower/hcalSimNumbering.xml → ...umbering/hfshower/v1/hcalSimNumbering.xml
diff --git a/SimG4CMS/ShowerLibraryProducer/python/hcalforwardshower_cfi.py b/SimG4CMS/ShowerLibraryProducer/python/hcalforwardshower_cfi.py
@@ -4,8 +4,8 @@
     geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', 
         'Geometry/HcalCommonData/data/hcalforwardmaterial.xml', 
         'Geometry/HcalCommonData/data/hcalforwardshower/v2/hcalforwardshower.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/hfshower/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/hfshower/hcalRecNumbering.xml'),
+        'Geometry/HcalCommonData/data/hcalSimNumbering/hfshower/v1/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/hfshower/v1/hcalRecNumbering.xml'),
     rootNodeName = cms.string('hcalforwardshower:HFWorld')
 )
 

diff --git a/SimG4CMS/ShowerLibraryProducer/src/HcalForwardAnalysis.cc b/SimG4CMS/ShowerLibraryProducer/src/HcalForwardAnalysis.cc
@@ -129,8 +129,8 @@ void HcalForwardAnalysis::setPhotons(const EndOfEvent* evt) {
   std::vector<HFShowerPhoton> LongFiberPhotons;
   LongFiberPhotons.clear();
   ShortFiberPhotons.clear();
-  int thehc_entries = theHC->entries();
   if (idHC >= 0 && theHC != nullptr) {
+    int thehc_entries = theHC->entries();
     edm::LogVerbatim("HcalForwardLib") << "FiberhitSize " << thehc_entries;
     for (j = 0; j < thehc_entries; j++) {
       FiberG4Hit* aHit = (*theHC)[j];