From 140153f8bae29bdd3aae25beac8e96e84d7e7b73 Mon Sep 17 00:00:00 2001
From: "theodore.efremov" <theodore.efremov@cea.fr>
Date: Tue, 15 Oct 2024 11:06:07 +0200
Subject: [PATCH] Moved the data year from the calib of the chio to the config
file
---
NPLib/Detectors/PISTA/TICPhysics.cxx | 11 ++++++++---
NPLib/Detectors/PISTA/TICPhysics.h | 3 +++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/NPLib/Detectors/PISTA/TICPhysics.cxx b/NPLib/Detectors/PISTA/TICPhysics.cxx
index 360d4e96f..ec3931bdc 100644
--- a/NPLib/Detectors/PISTA/TICPhysics.cxx
+++ b/NPLib/Detectors/PISTA/TICPhysics.cxx
@@ -100,12 +100,11 @@ void TICPhysics::BuildPhysicalEvent() {
if (fIC_Init[1]>0 && fIC_Init[5]>0) {
EtotInit = 0 ;
- int DataYear = Cal->GetValue("IC/DATA_YEAR",0);
double ScalorInit = Cal->GetValue("IC/INIT_ETOT_SCALING",0);
for (int Seg = 0; Seg<10; Seg++){
- if (Seg == 0 && DataYear == 2024 ){
+ if (Seg == 0 && m_Data_Year == 2024 ){
EtotInit += 0.75 * Cal->GetValue("IC/INIT_SEG"+NPL::itoa(Seg)+"_ALIGN",0);
}
@@ -224,6 +223,13 @@ void TICPhysics::ReadAnalysisConfig() {
m_E_Threshold = atof(DataBuffer.c_str());
cout << whatToDo << " " << m_E_Threshold << endl;
}
+
+ else if (whatToDo=="DATA_YEAR") {
+ AnalysisConfigFile >> DataBuffer;
+ m_Data_Year = atof(DataBuffer.c_str());
+ cout << whatToDo << " " << m_Data_Year << endl;
+ }
+
else if (whatToDo=="LOAD_Z_SPLINE"){
AnalysisConfigFile >> DataBuffer;
m_Z_SPLINE_PATH = DataBuffer;
@@ -310,7 +316,6 @@ void TICPhysics::AddParameterToCalibrationManager() {
//Calibration from online analysis
Cal->AddParameter("IC","INIT_ETOT_SCALING","IC_INIT_ETOT_SCALING");
- Cal->AddParameter("IC","DATA_YEAR","IC_DATA_YEAR");
for (int segment=0; segment<11;segment++){
Cal->AddParameter("IC","INIT_SEG"+NPL::itoa(segment+1)+"_ALIGN","IC_INIT_SEG"+NPL::itoa(segment+1)+"_ALIGN");
}
diff --git a/NPLib/Detectors/PISTA/TICPhysics.h b/NPLib/Detectors/PISTA/TICPhysics.h
index ef2135b07..dd3e6cf52 100644
--- a/NPLib/Detectors/PISTA/TICPhysics.h
+++ b/NPLib/Detectors/PISTA/TICPhysics.h
@@ -156,6 +156,9 @@ class TICPhysics : public TObject, public NPL::VDetector {
bool m_Z_SPLINE_CORRECTION; //!
TSpline3* m_Zspline; //!
+ //Year of acquisition
+ private:
+ double m_Data_Year; //!
// Static constructor to be passed to the Detector Factory
public:
static NPL::VDetector* Construct();
--
GitLab