Merge pull request #47738 from civanch/fixed_sens_det_initialisation

[SIM] Improved initialisation for calorimeters

Author: cmsbuild

SimG4CMS/Calo/src/CaloSD.cc

@@ -432,18 +432,24 @@ void CaloSD::DrawAll() {}
 
 void CaloSD::PrintAll() {
   for (int k = 0; k < nHC_; ++k) {
+    if (nullptr == theHC[k]) {
+      continue;
+    }
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("CaloSim") << "CaloSD: Collection " << theHC[k]->GetName();
+    edm::LogVerbatim("CaloSim") << "CaloSD: Collection " << k << " " << theHC[k]->GetName();
 #endif
     theHC[k]->PrintAllHits();
   }
 }
 
 void CaloSD::fillHits(edm::PCaloHitContainer& cc, const std::string& hname) {
   for (int k = 0; k < nHC_; ++k) {
+    if (nullptr == slave[k].get()) {
+      continue;
+    }
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("CaloSim") << "CaloSD: Tries to transfer " << slave[k].get()->hits().size() << " hits for "
-                                << slave[k].get()->name() << "   " << hname;
+    edm::LogVerbatim("CaloSim") << "CaloSD: " << k << ". Tries to transfer " << slave[k].get()->hits().size()
+                                << " hits for " << slave[k].get()->name() << "   " << hname;
 #endif
     if (slave[k].get()->name() == hname) {
       cc = slave[k].get()->hits();
@@ -783,6 +789,9 @@ void CaloSD::update(const EndOfTrack* trk) {
 void CaloSD::update(const ::EndOfEvent*) {
   endEvent();
   for (int k = 0; k < nHC_; ++k) {
+    if (nullptr == slave[k].get()) {
+      continue;
+    }
     slave[k].get()->ReserveMemory(theHC[k]->entries());
 
     int count(0);
@@ -857,7 +866,8 @@ void CaloSD::clearHits() {
     edm::LogVerbatim("CaloSim") << "CaloSD: Clears hit vector for " << GetName()
                                 << " and initialise slave: " << slave[k].get()->name();
 #endif
-    slave[k].get()->Initialize();
+    if (nullptr != slave[k].get())
+      slave[k].get()->Initialize();
   }
 }
 
@@ -1042,10 +1052,13 @@ void CaloSD::update(const BeginOfTrack* trk) {
 
 void CaloSD::cleanHitCollection() {
   for (int k = 0; k < nHC_; ++k) {
+    if (nullptr == theHC[k]) {
+      continue;
+    }
     std::vector<CaloG4Hit*>* theCollection = theHC[k]->GetVector();
 
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("CaloSim") << "CaloSD: collection before merging, size = " << theHC[k]->entries();
+    edm::LogVerbatim("CaloSim") << "CaloSD: collection " << k << " before merging, size = " << theHC[k]->entries();
 #endif
     if (reusehit[k].empty())
       reusehit[k].reserve(theHC[k]->entries() - cleanIndex[k]);
@@ -1112,7 +1125,6 @@ void CaloSD::cleanHitCollection() {
       CaloG4Hit* aHit((*theCollection)[i]);
 
       // selection
-
       double time = aHit->getTimeSlice();
       if (corrTOFBeam)
         time += correctT;
@@ -1121,9 +1133,7 @@ void CaloSD::cleanHitCollection() {
         edm::LogVerbatim("CaloSim") << "CaloSD: dropped CaloG4Hit "
                                     << " " << *aHit;
 #endif
-
         // create the list of hits to be reused
-
         reusehit[k].emplace_back((*theCollection)[i]);
         (*theCollection)[i] = nullptr;
         ++addhit;