Add option forceMinSecDifferenceToZero in CoinSorter for prototype te…

…stbench simus
mjordanst · Jul 18, 2023 · e0c643d · e0c643d
1 parent d3530b2
commit e0c643d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/source/digits_hits/include/GateCoincidenceSorter.hh b/source/digits_hits/include/GateCoincidenceSorter.hh
@@ -99,8 +99,15 @@ public:
     //! Set the minimum sector difference for valid coincidences
     inline void SetMinSectorDifference(G4int diff)
     { m_minSectorDifference = diff; }
-
-    //! Get the depth of the system-level for coincidences
+
+   //! Get the force to 0 minimum sector difference for valid coincidences
+    inline G4bool GetForcedTo0MinSectorDifference() const
+    { return m_forceMinSecDifferenceToZero; }
+    //! Set the force to 0 minimum sector difference for valid coincidences
+    inline void SetForcedTo0MinSectorDifference(G4bool diff)
+    { m_forceMinSecDifferenceToZero = diff; }
+
+  //! Get the depth of the system-level for coincidences
     inline G4int GetDepth() const
     { return m_depth; }
     //! Set the depth of the system-level for coincidences
@@ -192,10 +199,12 @@ protected:
 private:
     //! \name Work storage variable
     //@{
-
+    G4bool m_forceMinSecDifferenceToZero;
+
     std::list<GateDigi*> m_presortBuffer;      // incoming digis are presorted and buffered
     G4int                 m_presortBufferSize;
     G4bool                m_presortWarning;     // avoid repeat warnings
+
     bool                m_CCSorter;     // compton camera sorter
     G4bool             m_triggerOnlyByAbsorber; //! Is the window only open by digis generated in the absorber ?
     G4String      m_absorberSD;// absorber "SD' volume name CC

diff --git a/source/digits_hits/include/GateCoincidenceSorterMessenger.hh b/source/digits_hits/include/GateCoincidenceSorterMessenger.hh
@@ -60,6 +60,7 @@ private:
     G4UIcmdWithADoubleAndUnit   *windowJitterCmd;    //!< the UI command 'setWindowJitter'
     G4UIcmdWithADoubleAndUnit   *offsetJitterCmd;    //!< the UI command 'setOffsetJitter'
     G4UIcmdWithAnInteger        *minSectorDiffCmd;   //!< the UI command 'minSectorDifference'
+    G4UIcmdWithABool            *forceMinSectorDiffCmd;
     G4UIcmdWithAnInteger        *setDepthCmd;        //!< the UI command 'setDepth'
     G4UIcmdWithAnInteger        *setPresortBufferSizeCmd;  //!< the UI command 'setPresortBufferSize'
     G4UIcmdWithAString          *SetInputNameCmd;    //!< The UI command "set input name"

diff --git a/source/digits_hits/src/GateCoincidenceSorter.cc b/source/digits_hits/src/GateCoincidenceSorter.cc
@@ -39,6 +39,7 @@ GateCoincidenceSorter::GateCoincidenceSorter(GateDigitizerMgr* itsDigitizerMgr,
     m_offset(0.),
     m_offsetJitter(0.),
     m_minSectorDifference(2),
+    m_forceMinSecDifferenceToZero(false),	  
     m_multiplesPolicy(kKeepIfAllAreGoods),
     m_allDigiOpenCoincGate(false),
     m_depth(1),
@@ -693,9 +694,10 @@ G4bool GateCoincidenceSorter::IsForbiddenCoincidence(const GateDigi* digi1, cons
     if (sectorDiff2<0)
       sectorDiff2 += sectorNumber;
     G4int sectorDifference = std::min(sectorDiff1,sectorDiff2);
-
+    //G4cout<<sectorDifference<<G4endl;
+
     //Compare the sector difference with the minimum differences for valid coincidences
-    if (sectorDifference<m_minSectorDifference) {
+    if (sectorDifference<m_minSectorDifference && !m_forceMinSecDifferenceToZero) {
       if (nVerboseLevel>1)
         G4cout << "[GateCoincidenceSorter::IsForbiddenCoincidence]: coincidence between neighbor blocks --> refused\n";
       return true;
@@ -719,7 +721,7 @@ G4bool GateCoincidenceSorter::IsForbiddenCoincidence(const GateDigi* digi1, cons
   G4int sectorDifference = std::min(sectorDiff1,sectorDiff2);
 
   //Compare the sector difference with the minimum differences for valid coincidences
-  if (sectorDifference<m_minSectorDifference) {
+  if (sectorDifference<m_minSectorDifference && !m_forceMinSecDifferenceToZero) {
       	if (nVerboseLevel>1)
       	    G4cout << "[GateCoincidenceSorter::IsForbiddenCoincidence]: coincidence between neighbour blocks --> refused\n";
 	return true;

diff --git a/source/digits_hits/src/GateCoincidenceSorterMessenger.cc b/source/digits_hits/src/GateCoincidenceSorterMessenger.cc
@@ -53,6 +53,12 @@ GateCoincidenceSorterMessenger::GateCoincidenceSorterMessenger(GateCoincidenceSo
   minSectorDiffCmd->SetParameterName("diff",false);
   minSectorDiffCmd->SetRange("diff>=1");
 
+  cmdName = GetDirectoryName()+"forceMinSecDifferenceToZero";
+  forceMinSectorDiffCmd = new G4UIcmdWithABool(cmdName,this);
+  forceMinSectorDiffCmd->SetGuidance("Force the minimum sector difference for valid coincidences to 0: specsific case for prototype testbench simulations.");
+  forceMinSectorDiffCmd->SetParameterName("ForceDiff0",false);
+
+
   cmdName = GetDirectoryName()+"setDepth";
   setDepthCmd = new G4UIcmdWithAnInteger(cmdName.c_str(),this);
   setDepthCmd->SetGuidance("Set the depth of system-level for coincidences.");
@@ -111,7 +117,7 @@ GateCoincidenceSorterMessenger::~GateCoincidenceSorterMessenger()
     delete SetTriggerOnlyByAbsorberCmd;
     delete SetAcceptancePolicy4CCCmd;
     delete SetEventIDCoincCmd;
-
+    delete forceMinSectorDiffCmd;
 }
 
 
@@ -125,6 +131,8 @@ void GateCoincidenceSorterMessenger::SetNewValue(G4UIcommand* aCommand, G4String
     { m_CoincidenceSorter->SetOffset(offsetCmd->GetNewDoubleValue(newValue)); }
   else if( aCommand == offsetJitterCmd )
     { m_CoincidenceSorter->SetOffsetJitter(offsetJitterCmd->GetNewDoubleValue(newValue)); }
+  else if( aCommand == forceMinSectorDiffCmd )
+    { m_CoincidenceSorter->SetForcedTo0MinSectorDifference(forceMinSectorDiffCmd->GetNewBoolValue(newValue)); }
   else if( aCommand == minSectorDiffCmd )
     { m_CoincidenceSorter->SetMinSectorDifference(minSectorDiffCmd->GetNewIntValue(newValue)); }
   else if( aCommand == setDepthCmd )