diff --git a/NPLib/Core/NPCalibrationManager.cxx b/NPLib/Core/NPCalibrationManager.cxx index 0b03b3a59af944a176c544e73a60a2c439ec7daf..b7fe7b3fd6e63e9cfcc95675174d718d7d37b33d 100644 --- a/NPLib/Core/NPCalibrationManager.cxx +++ b/NPLib/Core/NPCalibrationManager.cxx @@ -95,9 +95,12 @@ CalibrationManager::~CalibrationManager() {} ////////////////////////////////////////////////////////////////// -bool CalibrationManager::AddParameter(std::string DetectorName , std::string ParameterName , std::string Token ){ +bool CalibrationManager::AddParameter(std::string DetectorName , std::string ParameterName , std::string Token, std::vector<double> def ){ std::string ParameterPath = DetectorName + "/" + ParameterName ; fToken[Token] = ParameterPath ; + // Case where a default value is given + if(def.size()!=0) + fCalibrationCoeff[ParameterPath] = def; return true; } diff --git a/NPLib/Core/NPCalibrationManager.h b/NPLib/Core/NPCalibrationManager.h index 2bf88eaad0fb1418bae8659e3db2ee736b7912fb..4ea2fd5cef5e3bb3e0e21f5bdbfbf1a8cb9899fb 100644 --- a/NPLib/Core/NPCalibrationManager.h +++ b/NPLib/Core/NPCalibrationManager.h @@ -52,7 +52,7 @@ class CalibrationManager{ // call like : myCalibrationManager->AddParameter( "MUST2" ,"Telescope5_Si_X38_E", "T5_Si_X38_E" ) // return false if the token is not found in the file list - bool AddParameter(std::string DetectorName , std::string ParameterName , std::string Token) ; + bool AddParameter(std::string DetectorName , std::string ParameterName , std::string Token,std::vector<double> def=std::vector<double>()) ; // call like : myCalibrationManager->ApplyCalibration( "MUST2/Telescope5_Si_X38_E" , RawEnergy ) // return the Calibrated value