SegFault correction: system def in CoinSorter

OpenGATE · Aug 10, 2023 · 6faa880 · 6faa880
1 parent bbcb49b
commit 6faa880
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/source/digits_hits/src/GateCoincidenceSorter.cc b/source/digits_hits/src/GateCoincidenceSorter.cc
@@ -162,8 +162,11 @@ void GateCoincidenceSorter::SetAcceptancePolicy4CC(const G4String &policy)
 
 void GateCoincidenceSorter::Digitize()
 {
-	//G4cout<<"GateCoincidenceSorter::Digitize "<< GetOutputName() <<G4endl;
-		//G4cout<< "m_inputName "<< m_inputName<<G4endl;
+  //	G4cout<<"GateCoincidenceSorter::Digitize "<< GetOutputName() <<G4endl;
+  //	G4cout<< "m_inputName "<< m_inputName<<G4endl;
+
+
+
   GateDigi* digi;
   std::list<GateDigi*>::iterator buf_iter;                // presort buffer iterator
 
@@ -177,7 +180,9 @@ void GateCoincidenceSorter::Digitize()
   //Input digi collection
   GateDigitizerMgr* digitizerMgr = GateDigitizerMgr::GetInstance();
   GateSinglesDigitizer* inputDigitizer;
+
   inputDigitizer = digitizerMgr->FindSinglesDigitizer(m_inputName);//m_collectionName);
+  //G4cout<<"m_inputName "<<inputDigitizer->GetName()<<G4endl;
   if (!inputDigitizer)
 	  if (digitizerMgr->m_SDlist.size()==1)
   	  {
@@ -188,6 +193,14 @@ void GateCoincidenceSorter::Digitize()
 	  else
 		  GateError("ERROR: The name _"+ m_inputName+"_ is unknown for input singles digicollection! \n");
 
+  if(!m_system)
+    {
+      //G4cout<<"Unindefined system"<<G4endl;
+      m_system=inputDigitizer->GetSystem();
+    }		
+  //G4cout<<m_system->GetName()<<G4endl;
+
+
   G4int inputCollID=inputDigitizer->m_outputDigiCollectionID;
   //G4cout<<"inputCollID "<<inputCollID<<G4endl;
   G4DigiManager *fDM = G4DigiManager::GetDMpointer();
@@ -654,7 +667,7 @@ G4int GateCoincidenceSorter::ComputeSectorID(const GateDigi& digi)
                 }
           }
 
-      }
+      }x
       else{
           G4cout<<"[GateCoincidenceSorter]: Problems in CC accpetance policy"<<G4endl;
       }
@@ -667,12 +680,11 @@ G4int GateCoincidenceSorter::ComputeSectorID(const GateDigi& digi)
 G4bool GateCoincidenceSorter::IsForbiddenCoincidence(const GateDigi* digi1, const GateDigi* digi2)
 {
 
-	if(!GateSystemListManager::GetInstance()->GetIsAnySystemDefined())
+  	if(!GateSystemListManager::GetInstance()->GetIsAnySystemDefined())
 	{
 		// TODO GND define case if there is no system defiend!
 
 	}
-
 	G4int blockID1 = m_system->GetMainComponentIDGND(digi1),
         blockID2 = m_system->GetMainComponentIDGND(digi2);
 
@@ -681,7 +693,7 @@ G4bool GateCoincidenceSorter::IsForbiddenCoincidence(const GateDigi* digi1, cons
   // the geometry construction of the scanner (spherical for system ecatAccel and cylindrical
   // for other systems as Ecat, CPET and cylindricalPET)
 
-  const G4String name = m_system->GetName();
+        const G4String name = m_system->GetName();
   G4String nameComp = "systems/ecatAccel";
   //G4cout << "NAME OF THE SYSTEM: " << name << "; NAME TO COMPARE: " << nameComp << Gateendl;
   int comp = strcmp(name,nameComp);
@@ -734,10 +746,10 @@ G4bool GateCoincidenceSorter::IsForbiddenCoincidence(const GateDigi* digi1, cons
       	if (nVerboseLevel>1)
       	    G4cout << "[GateCoincidenceSorter::IsForbiddenCoincidence]: coincidence between neighbour blocks --> refused\n";
 	return true;
-  }
+	}
 
   return false;
-  }
+   }
 
 }
 //------------------------------------------------------------------------------------------------------