Merge branch 'develop' into coincidenceSorter

OpenGATE · Sep 3, 2024 · c7e61c6 · c7e61c6
2 parents 59d3037 + af49975
commit c7e61c6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/source/.project b/source/.project
diff --git a/source/digits_hits/include/GateCoincidenceTimeDiffSelector.hh b/source/digits_hits/include/GateCoincidenceTimeDiffSelector.hh
@@ -31,7 +31,9 @@ See LICENSE.md for further details
 class GateCoincidenceTimeDiffSelectorMessenger;
 
 
-class GateCoincidenceTimeDiffSelector : public GateVDigitizerModule,public GateDigi
+
+class GateCoincidenceTimeDiffSelector : public GateVDigitizerModule
+
 {
 public:
 

diff --git a/source/digits_hits/src/GateCoincidenceDigitizerMessenger.cc b/source/digits_hits/src/GateCoincidenceDigitizerMessenger.cc
@@ -125,7 +125,8 @@ void GateCoincidenceDigitizerMessenger::SetNewValue(G4UIcommand* command,G4Strin
 const G4String& GateCoincidenceDigitizerMessenger::DumpMap()
 {
 
-   static G4String theList = "deadtime MultiplesKiller Buffer timeDiffSelector" ;//readout adder energyFraming timeResolution energyResolution spatialResolution efficiency deadtime pileup adderCompton opticaladder noise merger";
+
+   static G4String theList = "deadtime multiplesKiller buffer timeDiffSelector" ;//readout adder energyFraming timeResolution energyResolution spatialResolution efficiency deadtime pileup adderCompton opticaladder noise merger";
 
 
    return theList;
@@ -171,8 +172,6 @@ void GateCoincidenceDigitizerMessenger::DoInsertion(const G4String& childTypeNam
     	  m_CoinDigitizer->AddNewModule(newDM);
       }
 
-
-
   /*else if (childTypeName=="readout")
   {
 	  newDM = new GateReadout(m_digitizer, DMname);

diff --git a/source/digits_hits/src/GateCoincidenceSorter.cc b/source/digits_hits/src/GateCoincidenceSorter.cc
@@ -184,16 +184,6 @@ void GateCoincidenceSorter::Digitize()
   GateSinglesDigitizer* inputDigitizer;
 
   inputDigitizer = digitizerMgr->FindSinglesDigitizer(m_inputName);//m_collectionName);
-  //G4cout<<"m_inputName "<<inputDigitizer->GetName()<<G4endl;
-  if (!inputDigitizer)
-	  if (digitizerMgr->m_SDlist.size()==1)
-  	  {
-		  G4String new_name= m_inputName+"_"+digitizerMgr->m_SDlist[0]->GetName();
-		  //G4cout<<" new_name "<< new_name<<G4endl;
-		  inputDigitizer = digitizerMgr->FindSinglesDigitizer(new_name);
-  	  }
-	  else
-		  GateError("ERROR: The name _"+ m_inputName+"_ is unknown for input singles digicollection! \n");
 
   if(!m_system)
     {

diff --git a/source/digits_hits/src/GateCoincidenceSorterMessenger.cc b/source/digits_hits/src/GateCoincidenceSorterMessenger.cc
@@ -166,6 +166,8 @@ void GateCoincidenceSorterMessenger::SetNewValue(G4UIcommand* aCommand, G4String
 	    	  {
 	  		  G4String new_name= newValue+"_"+digitizerMgr->m_SDlist[0]->GetName();
 	  		  //G4cout<<" new_name "<< new_name<<G4endl;
+	  		  if (!(digitizerMgr->FindSinglesDigitizer(new_name)))
+	  			  GateError("ERROR: The name used in coincidence sorter has to be the SD name;_"+ newValue+"_ is unknown for input singles digicollection! \n");
 	  		  inputDigitizer = digitizerMgr->FindSinglesDigitizer(new_name);
 	  		  m_CoincidenceSorter->SetInputName(new_name);
 	  		  m_CoincidenceSorter->SetSystem(new_name); //! A

diff --git a/source/digits_hits/src/GateEnergyResolution.cc b/source/digits_hits/src/GateEnergyResolution.cc
@@ -95,7 +95,7 @@ void GateEnergyResolution::Digitize()
 
 	GateDigi* inputDigi;
 
-	G4double reso;
+	G4double reso = 0;
 
   if (IDC)
      {
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,9 @@ See LICENSE.md for further details @@
     class GateCoincidenceTimeDiffSelectorMessenger;
-    class GateCoincidenceTimeDiffSelector : public GateVDigitizerModule,public GateDigi
+    class GateCoincidenceTimeDiffSelector : public GateVDigitizerModule
     {
     public:
@@ Expand Down @@