attempt to fix crash at the 1st event

Author: civanch

SimG4CMS/Calo/src/CaloSD.cc

@@ -432,8 +432,9 @@ 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();
   }
@@ -783,6 +784,7 @@ 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);
@@ -1043,10 +1045,12 @@ 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]);
@@ -1059,21 +1063,21 @@ void CaloSD::cleanHitCollection() {
       sort((hitvec.begin() + cleanIndex[k]), hitvec.end(), CaloG4HitLess());
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("CaloSim") << "CaloSD::cleanHitCollection: sort hits in buffer starting from "
-                                  << "element = " << cleanIndex[k];
+				  << "element = " << cleanIndex[k];
       for (unsigned int i = 0; i < hitvec.size(); ++i) {
-        if (hitvec[i] == nullptr)
-          edm::LogVerbatim("CaloSim") << i << " has a null pointer";
-        else
-          edm::LogVerbatim("CaloSim") << i << " " << *hitvec[i];
+	if (hitvec[i] == nullptr)
+	  edm::LogVerbatim("CaloSim") << i << " has a null pointer";
+	else
+	  edm::LogVerbatim("CaloSim") << i << " " << *hitvec[i];
       }
 #endif
       CaloG4HitEqual equal;
       for (unsigned int i = cleanIndex[k]; i < hitvec.size(); ++i) {
-        int jump = 0;
-        for (unsigned int j = i + 1; j < hitvec.size() && equal(hitvec[i], hitvec[j]); ++j) {
-          ++jump;
-          // merge j to i
-          (*hitvec[i]).addEnergyDeposit(*hitvec[j]);
+	int jump = 0;
+	for (unsigned int j = i + 1; j < hitvec.size() && equal(hitvec[i], hitvec[j]); ++j) {
+	  ++jump;
+	  // merge j to i
+	  (*hitvec[i]).addEnergyDeposit(*hitvec[j]);
           (*hitvec[j]).setEM(0.);
           (*hitvec[j]).setHadr(0.);
           reusehit[k].emplace_back(hitvec[j]);
@@ -1113,7 +1117,6 @@ void CaloSD::cleanHitCollection() {
       CaloG4Hit* aHit((*theCollection)[i]);
 
       // selection
-
       double time = aHit->getTimeSlice();
       if (corrTOFBeam)
         time += correctT;
@@ -1122,9 +1125,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;