Merge pull request #654 from OpenGATE/IRnewOption

IntrinsicResolution GainVariance as option
OpenGATE · Dec 8, 2023 · c2ae546 · c2ae546
2 parents 1b9f024 + 92198d0
commit c2ae546
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/source/digits_hits/include/GateIntrinsicResolution.hh b/source/digits_hits/include/GateIntrinsicResolution.hh
@@ -61,6 +61,8 @@ public:
   //! Apply an unique quantum efficiency for all the channels
   void SetUniqueQE(G4double val) { m_uniqueQE = val; };
 
+  void SetVariance(G4double val) { m_variance = val; };
+
   void CreateTable();
 
   void CheckVolumeName(G4String val);
@@ -76,6 +78,8 @@ protected:
   G4double m_XtalkpCent;
   G4bool isFirstEvent;
 
+  G4double m_variance;
+
   G4double m_uniqueQE;    //!< Value of the quantum efficiency if it's unique
   G4int m_nbFiles;        //!< Number of file(s) used for creating the lookout table
   std::vector<G4String> m_file;  //!< Vector which contains the name(s) of the file(s) for the lookout table

diff --git a/source/digits_hits/include/GateIntrinsicResolutionMessenger.hh b/source/digits_hits/include/GateIntrinsicResolutionMessenger.hh
@@ -53,6 +53,9 @@ private:
   G4UIcmdWithADouble          *coeffTECmd;
   G4UIcmdWithAString   *newFileQECmd;
   G4UIcmdWithADouble   *uniqueQECmd;
+
+  G4UIcmdWithADouble   *varianceCmd;
+
   G4UIcmdWithADouble   *edgesFractionCmd;
   G4UIcmdWithADouble   *cornersFractionCmd;
 

diff --git a/source/digits_hits/src/GateIntrinsicResolution.cc b/source/digits_hits/src/GateIntrinsicResolution.cc
@@ -60,6 +60,7 @@ GateIntrinsicResolution::GateIntrinsicResolution(GateSinglesDigitizer *digitizer
    m_LY(1),
    m_TE(1),
    m_QE(1),
+  m_variance(0.1),
    m_edgesCrosstalkFraction(0),
    m_cornersCrosstalkFraction(0),
    isFirstEvent(true),
@@ -167,7 +168,7 @@ void GateIntrinsicResolution::Digitize()
 		  G4double Nph = energy*m_LY*m_TE*m_QE*m_XtalkpCent;
 		  G4double Ri = m_resolution * sqrt((m_Eref / energy));
 
-		  G4double resol = sqrt((1.1/Nph)*(GateConstants::fwhm_to_sigma*GateConstants::fwhm_to_sigma) + Ri*Ri);
+		  G4double resol = sqrt((1+m_variance/Nph)*(GateConstants::fwhm_to_sigma*GateConstants::fwhm_to_sigma) + Ri*Ri);
 
 		  m_outputDigi->SetEnergy(G4RandGauss::shoot(energy,(resol * energy)/GateConstants::fwhm_to_sigma));
 

diff --git a/source/digits_hits/src/GateIntrinsicResolutionMessenger.cc b/source/digits_hits/src/GateIntrinsicResolutionMessenger.cc
@@ -59,14 +59,21 @@ GateIntrinsicResolutionMessenger::GateIntrinsicResolutionMessenger (GateIntrinsi
     uniqueQECmd = new G4UIcmdWithADouble(cmdName,this);
     uniqueQECmd->SetGuidance("Set an unique quantum efficiency");
 
-	cmdName = GetDirectoryName() + "setEdgesFraction";
+
+    cmdName = GetDirectoryName() + "setGainVariance";
+    varianceCmd = new G4UIcmdWithADouble(cmdName,this);
+    varianceCmd->SetGuidance("Set an unique quantum efficiency");
+
+
+	cmdName = GetDirectoryName() + "setXtalkEdgesFraction";
 	edgesFractionCmd = new G4UIcmdWithADouble(cmdName,this);
 	edgesFractionCmd->SetGuidance("Set the fraction of energy which leaves on each edge crystal");
 
-	cmdName = GetDirectoryName() + "setCornersFraction";
+	cmdName = GetDirectoryName() + "setXtalkCornersFraction";
 	cornersFractionCmd = new G4UIcmdWithADouble(cmdName,this);
 	cornersFractionCmd->SetGuidance("Set the fraction of the energy which leaves on each corner crystal");
 
+
 }
 
 
@@ -78,6 +85,7 @@ GateIntrinsicResolutionMessenger::~GateIntrinsicResolutionMessenger()
 	delete  coeffTECmd;
 	delete  newFileQECmd;
 	delete  uniqueQECmd;
+	delete  varianceCmd;
 	delete edgesFractionCmd;
 	delete cornersFractionCmd;
 }
@@ -109,6 +117,10 @@ void GateIntrinsicResolutionMessenger::SetNewValue(G4UIcommand * aCommand,G4Stri
 	    {
 	    	m_IntrinsicResolution->SetUniqueQE(uniqueQECmd->GetNewDoubleValue(newValue));
 	    }
+	    else if ( aCommand==varianceCmd )
+	    {
+	    	m_IntrinsicResolution->SetVariance(varianceCmd->GetNewDoubleValue(newValue));
+	    }
 	    else if (aCommand ==edgesFractionCmd)
 	      {
 	    	m_IntrinsicResolution->SetEdgesFraction (edgesFractionCmd->GetNewDoubleValue(newValue));
@@ -117,7 +129,6 @@ void GateIntrinsicResolutionMessenger::SetNewValue(G4UIcommand * aCommand,G4Stri
 	      {
 			m_IntrinsicResolution->SetCornersFraction (cornersFractionCmd->GetNewDoubleValue(newValue));
 	      }
-
 	    else
 	    {
 	    	GateClockDependentMessenger::SetNewValue(aCommand,newValue);