Skip to content

Commit 4f5dfad

Browse files
JinjooSeoJinjooSeo
committed
Rename PID calibration variables
1 parent 23a853b commit 4f5dfad

14 files changed

Lines changed: 225 additions & 274 deletions

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,20 @@ double VarManager::ComputePIDcalibration(int species, double nSigmaValue)
251251
CalibObjects calibMean, calibSigma;
252252
switch (species) {
253253
case 0:
254-
calibMean = kTPCElectronMean;
255-
calibSigma = kTPCElectronSigma;
254+
calibMean = kTPCElectronMeanData;
255+
calibSigma = kTPCElectronSigmaData;
256256
break;
257257
case 1:
258-
calibMean = kTPCPionMean;
259-
calibSigma = kTPCPionSigma;
258+
calibMean = kTPCPionMeanData;
259+
calibSigma = kTPCPionSigmaData;
260260
break;
261261
case 2:
262-
calibMean = kTPCKaonMean;
263-
calibSigma = kTPCKaonSigma;
262+
calibMean = kTPCKaonMeanData;
263+
calibSigma = kTPCKaonSigmaData;
264264
break;
265265
case 3:
266-
calibMean = kTPCProtonMean;
267-
calibSigma = kTPCProtonSigma;
266+
calibMean = kTPCProtonMeanData;
267+
calibSigma = kTPCProtonSigmaData;
268268
break;
269269
default:
270270
LOG(fatal) << "Invalid species for PID calibration: " << species;
@@ -297,24 +297,24 @@ double VarManager::ComputePIDcalibration(int species, double nSigmaValue)
297297
CalibObjects calibMean, calibSigma, calibStatus;
298298
switch (species) {
299299
case 0:
300-
calibMean = kTPCElectronMean;
301-
calibSigma = kTPCElectronSigma;
302-
calibStatus = kTPCElectronStatus;
300+
calibMean = kTPCElectronMeanData;
301+
calibSigma = kTPCElectronSigmaData;
302+
calibStatus = kTPCElectronStatusData;
303303
break;
304304
case 1:
305-
calibMean = kTPCPionMean;
306-
calibSigma = kTPCPionSigma;
307-
calibStatus = kTPCPionStatus;
305+
calibMean = kTPCPionMeanData;
306+
calibSigma = kTPCPionSigmaData;
307+
calibStatus = kTPCPionStatusData;
308308
break;
309309
case 2:
310-
calibMean = kTPCKaonMean;
311-
calibSigma = kTPCKaonSigma;
312-
calibStatus = kTPCKaonStatus;
310+
calibMean = kTPCKaonMeanData;
311+
calibSigma = kTPCKaonSigmaData;
312+
calibStatus = kTPCKaonStatusData;
313313
break;
314314
case 3:
315-
calibMean = kTPCProtonMean;
316-
calibSigma = kTPCProtonSigma;
317-
calibStatus = kTPCProtonStatus;
315+
calibMean = kTPCProtonMeanData;
316+
calibSigma = kTPCProtonSigmaData;
317+
calibStatus = kTPCProtonStatusData;
318318
break;
319319
default:
320320
LOG(fatal) << "Invalid species for PID calibration: " << species;
@@ -378,26 +378,26 @@ double VarManager::ComputePIDcalibration(int species, double nSigmaValue)
378378
CalibObjects calibMeanSim, calibSigmaSim, calibMeanData, calibSigmaData;
379379
switch (species) {
380380
case 0:
381-
calibMeanSim = kTPCElectronMean;
382-
calibSigmaSim = kTPCElectronSigma;
381+
calibMeanSim = kTPCElectronMeanMC;
382+
calibSigmaSim = kTPCElectronSigmaMC;
383383
calibMeanData = kTPCElectronMeanData;
384384
calibSigmaData = kTPCElectronSigmaData;
385385
break;
386386
case 1:
387-
calibMeanSim = kTPCPionMean;
388-
calibSigmaSim = kTPCPionSigma;
387+
calibMeanSim = kTPCPionMeanMC;
388+
calibSigmaSim = kTPCPionSigmaMC;
389389
calibMeanData = kTPCPionMeanData;
390390
calibSigmaData = kTPCPionSigmaData;
391391
break;
392392
case 2:
393-
calibMeanSim = kTPCKaonMean;
394-
calibSigmaSim = kTPCKaonSigma;
393+
calibMeanSim = kTPCKaonMeanMC;
394+
calibSigmaSim = kTPCKaonSigmaMC;
395395
calibMeanData = kTPCKaonMeanData;
396396
calibSigmaData = kTPCKaonSigmaData;
397397
break;
398398
case 3:
399-
calibMeanSim = kTPCProtonMean;
400-
calibSigmaSim = kTPCProtonSigma;
399+
calibMeanSim = kTPCProtonMeanMC;
400+
calibSigmaSim = kTPCProtonSigmaMC;
401401
calibMeanData = kTPCProtonMeanData;
402402
calibSigmaData = kTPCProtonSigmaData;
403403
break;
@@ -431,26 +431,26 @@ double VarManager::ComputePIDcalibration(int species, double nSigmaValue)
431431
CalibObjects calibMeanSim, calibSigmaSim, calibMeanData, calibSigmaData;
432432
switch (species) {
433433
case 0:
434-
calibMeanSim = kTPCElectronMean;
435-
calibSigmaSim = kTPCElectronSigma;
434+
calibMeanSim = kTPCElectronMeanMC;
435+
calibSigmaSim = kTPCElectronSigmaMC;
436436
calibMeanData = kTPCElectronMeanData;
437437
calibSigmaData = kTPCElectronSigmaData;
438438
break;
439439
case 1:
440-
calibMeanSim = kTPCPionMean;
441-
calibSigmaSim = kTPCPionSigma;
440+
calibMeanSim = kTPCPionMeanMC;
441+
calibSigmaSim = kTPCPionSigmaMC;
442442
calibMeanData = kTPCPionMeanData;
443443
calibSigmaData = kTPCPionSigmaData;
444444
break;
445445
case 2:
446-
calibMeanSim = kTPCKaonMean;
447-
calibSigmaSim = kTPCKaonSigma;
446+
calibMeanSim = kTPCKaonMeanMC;
447+
calibSigmaSim = kTPCKaonSigmaMC;
448448
calibMeanData = kTPCKaonMeanData;
449449
calibSigmaData = kTPCKaonSigmaData;
450450
break;
451451
case 3:
452-
calibMeanSim = kTPCProtonMean;
453-
calibSigmaSim = kTPCProtonSigma;
452+
calibMeanSim = kTPCProtonMeanMC;
453+
calibSigmaSim = kTPCProtonSigmaMC;
454454
calibMeanData = kTPCProtonMeanData;
455455
calibSigmaData = kTPCProtonSigmaData;
456456
break;

‎PWGDQ/Core/VarManager.h‎

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,26 +1098,26 @@ class VarManager : public TObject
10981098
}; // end of Variables enumeration
10991099

11001100
enum CalibObjects {
1101-
kTPCElectronMean = 0,
1102-
kTPCElectronSigma,
1103-
kTPCElectronStatus,
1104-
kTPCElectronMeanData,
1101+
kTPCElectronMeanData = 0,
11051102
kTPCElectronSigmaData,
1106-
kTPCPionMean,
1107-
kTPCPionSigma,
1108-
kTPCPionStatus,
1103+
kTPCElectronStatusData,
1104+
kTPCElectronMeanMC,
1105+
kTPCElectronSigmaMC,
11091106
kTPCPionMeanData,
11101107
kTPCPionSigmaData,
1111-
kTPCKaonMean,
1112-
kTPCKaonSigma,
1113-
kTPCKaonStatus,
1108+
kTPCPionStatusData,
1109+
kTPCPionMeanMC,
1110+
kTPCPionSigmaMC,
11141111
kTPCKaonMeanData,
11151112
kTPCKaonSigmaData,
1116-
kTPCProtonMean,
1117-
kTPCProtonSigma,
1118-
kTPCProtonStatus,
1113+
kTPCKaonStatusData,
1114+
kTPCKaonMeanMC,
1115+
kTPCKaonSigmaMC,
11191116
kTPCProtonMeanData,
11201117
kTPCProtonSigmaData,
1118+
kTPCProtonStatusData,
1119+
kTPCProtonMeanMC,
1120+
kTPCProtonSigmaMC,
11211121
kNCalibObjects
11221122
};
11231123

@@ -1440,28 +1440,51 @@ class VarManager : public TObject
14401440
template <typename M, typename T>
14411441
static void FillResolutions(M const& mcTrack, T const& track, float* values = nullptr);
14421442

1443-
static void SetCalibrationObject(CalibObjects calib, TObject* obj)
1443+
static bool HasCalibrationObject(CalibObjects calib)
14441444
{
1445-
fgCalibs[calib] = obj;
1446-
// Check whether all the needed objects for TPC postcalibration are available
1447-
if (fgCalibs.find(kTPCElectronMean) != fgCalibs.end() && fgCalibs.find(kTPCElectronSigma) != fgCalibs.end()) {
1448-
fgRunTPCPostCalibration[0] = true;
1445+
auto obj = fgCalibs.find(calib);
1446+
return (obj != fgCalibs.end() && obj->second != nullptr);
1447+
}
1448+
1449+
static void UpdateTPCPostCalibrationFlags()
1450+
{
1451+
bool isMCTuning = (fgCalibrationType == 3 || fgCalibrationType == 4);
1452+
1453+
bool hasElectronSimCalibration = HasCalibrationObject(kTPCElectronMeanMC) && HasCalibrationObject(kTPCElectronSigmaMC);
1454+
bool hasElectronDataCalibration = HasCalibrationObject(kTPCElectronMeanData) && HasCalibrationObject(kTPCElectronSigmaData);
1455+
fgRunTPCPostCalibration[0] = (isMCTuning ? (hasElectronSimCalibration && hasElectronDataCalibration) : hasElectronDataCalibration);
1456+
if (fgRunTPCPostCalibration[0]) {
14491457
fgUsedVars[kTPCnSigmaEl_Corr] = true;
14501458
}
1451-
if (fgCalibs.find(kTPCPionMean) != fgCalibs.end() && fgCalibs.find(kTPCPionSigma) != fgCalibs.end()) {
1452-
fgRunTPCPostCalibration[1] = true;
1459+
1460+
bool hasPionSimCalibration = HasCalibrationObject(kTPCPionMeanMC) && HasCalibrationObject(kTPCPionSigmaMC);
1461+
bool hasPionDataCalibration = HasCalibrationObject(kTPCPionMeanData) && HasCalibrationObject(kTPCPionSigmaData);
1462+
fgRunTPCPostCalibration[1] = (isMCTuning ? (hasPionSimCalibration && hasPionDataCalibration) : hasPionDataCalibration);
1463+
if (fgRunTPCPostCalibration[1]) {
14531464
fgUsedVars[kTPCnSigmaPi_Corr] = true;
14541465
}
1455-
if (fgCalibs.find(kTPCKaonMean) != fgCalibs.end() && fgCalibs.find(kTPCKaonSigma) != fgCalibs.end()) {
1456-
fgRunTPCPostCalibration[2] = true;
1466+
1467+
bool hasKaonSimCalibration = HasCalibrationObject(kTPCKaonMeanMC) && HasCalibrationObject(kTPCKaonSigmaMC);
1468+
bool hasKaonDataCalibration = HasCalibrationObject(kTPCKaonMeanData) && HasCalibrationObject(kTPCKaonSigmaData);
1469+
fgRunTPCPostCalibration[2] = (isMCTuning ? (hasKaonSimCalibration && hasKaonDataCalibration) : hasKaonDataCalibration);
1470+
if (fgRunTPCPostCalibration[2]) {
14571471
fgUsedVars[kTPCnSigmaKa_Corr] = true;
14581472
}
1459-
if (fgCalibs.find(kTPCProtonMean) != fgCalibs.end() && fgCalibs.find(kTPCProtonSigma) != fgCalibs.end()) {
1460-
fgRunTPCPostCalibration[3] = true;
1473+
1474+
bool hasProtonSimCalibration = HasCalibrationObject(kTPCProtonMeanMC) && HasCalibrationObject(kTPCProtonSigmaMC);
1475+
bool hasProtonDataCalibration = HasCalibrationObject(kTPCProtonMeanData) && HasCalibrationObject(kTPCProtonSigmaData);
1476+
fgRunTPCPostCalibration[3] = (isMCTuning ? (hasProtonSimCalibration && hasProtonDataCalibration) : hasProtonDataCalibration);
1477+
if (fgRunTPCPostCalibration[3]) {
14611478
fgUsedVars[kTPCnSigmaPr_Corr] = true;
14621479
}
14631480
}
14641481

1482+
static void SetCalibrationObject(CalibObjects calib, TObject* obj)
1483+
{
1484+
fgCalibs[calib] = obj;
1485+
UpdateTPCPostCalibrationFlags();
1486+
}
1487+
14651488
static void SetCalibrationType(int type, bool useInterpolation = true)
14661489
{
14671490
if (type < 0 || type > 4) {

‎PWGDQ/TableProducer/tableMaker.cxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -382,15 +382,15 @@ struct TableMaker {
382382
if (fCurrentRun != bc.runNumber()) {
383383
if (fConfigComputeTPCpostCalib) {
384384
auto calibList = fCCDB->getForTimeStamp<TList>(useCCDBConfigurations.fConfigCcdbPathTPC.value, bc.timestamp());
385-
VarManager::SetCalibrationObject(VarManager::kTPCElectronMean, calibList->FindObject("mean_map_electron"));
386-
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigma, calibList->FindObject("sigma_map_electron"));
387-
VarManager::SetCalibrationObject(VarManager::kTPCPionMean, calibList->FindObject("mean_map_pion"));
388-
VarManager::SetCalibrationObject(VarManager::kTPCPionSigma, calibList->FindObject("sigma_map_pion"));
389-
VarManager::SetCalibrationObject(VarManager::kTPCProtonMean, calibList->FindObject("mean_map_proton"));
390-
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigma, calibList->FindObject("sigma_map_proton"));
385+
VarManager::SetCalibrationObject(VarManager::kTPCElectronMeanData, calibList->FindObject("mean_map_electron"));
386+
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigmaData, calibList->FindObject("sigma_map_electron"));
387+
VarManager::SetCalibrationObject(VarManager::kTPCPionMeanData, calibList->FindObject("mean_map_pion"));
388+
VarManager::SetCalibrationObject(VarManager::kTPCPionSigmaData, calibList->FindObject("sigma_map_pion"));
389+
VarManager::SetCalibrationObject(VarManager::kTPCProtonMeanData, calibList->FindObject("mean_map_proton"));
390+
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigmaData, calibList->FindObject("sigma_map_proton"));
391391
if (fConfigComputeTPCpostCalibKaon) {
392-
VarManager::SetCalibrationObject(VarManager::kTPCKaonMean, calibList->FindObject("mean_map_kaon"));
393-
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigma, calibList->FindObject("sigma_map_kaon"));
392+
VarManager::SetCalibrationObject(VarManager::kTPCKaonMeanData, calibList->FindObject("mean_map_kaon"));
393+
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigmaData, calibList->FindObject("sigma_map_kaon"));
394394
}
395395
}
396396
if (fIsRun2 == true) {
@@ -853,15 +853,15 @@ struct TableMaker {
853853
if (fCurrentRun != bc.runNumber()) {
854854
if (fConfigComputeTPCpostCalib) {
855855
auto calibList = fCCDB->getForTimeStamp<TList>(useCCDBConfigurations.fConfigCcdbPathTPC.value, bc.timestamp());
856-
VarManager::SetCalibrationObject(VarManager::kTPCElectronMean, calibList->FindObject("mean_map_electron"));
857-
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigma, calibList->FindObject("sigma_map_electron"));
858-
VarManager::SetCalibrationObject(VarManager::kTPCPionMean, calibList->FindObject("mean_map_pion"));
859-
VarManager::SetCalibrationObject(VarManager::kTPCPionSigma, calibList->FindObject("sigma_map_pion"));
860-
VarManager::SetCalibrationObject(VarManager::kTPCProtonMean, calibList->FindObject("mean_map_proton"));
861-
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigma, calibList->FindObject("sigma_map_proton"));
856+
VarManager::SetCalibrationObject(VarManager::kTPCElectronMeanData, calibList->FindObject("mean_map_electron"));
857+
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigmaData, calibList->FindObject("sigma_map_electron"));
858+
VarManager::SetCalibrationObject(VarManager::kTPCPionMeanData, calibList->FindObject("mean_map_pion"));
859+
VarManager::SetCalibrationObject(VarManager::kTPCPionSigmaData, calibList->FindObject("sigma_map_pion"));
860+
VarManager::SetCalibrationObject(VarManager::kTPCProtonMeanData, calibList->FindObject("mean_map_proton"));
861+
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigmaData, calibList->FindObject("sigma_map_proton"));
862862
if (fConfigComputeTPCpostCalibKaon) {
863-
VarManager::SetCalibrationObject(VarManager::kTPCKaonMean, calibList->FindObject("mean_map_kaon"));
864-
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigma, calibList->FindObject("sigma_map_kaon"));
863+
VarManager::SetCalibrationObject(VarManager::kTPCKaonMeanData, calibList->FindObject("mean_map_kaon"));
864+
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigmaData, calibList->FindObject("sigma_map_kaon"));
865865
}
866866
}
867867
if (fIsRun2 == true) {

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,22 +1693,22 @@ struct TableMaker {
16931693
if (bcs.size() > 0 && fCurrentRun != bcs.begin().runNumber()) {
16941694
if (fConfigPostCalibTPC.fConfigComputeTPCpostCalib) {
16951695
auto calibList = fCCDB->getForTimeStamp<TList>(fConfigCCDB.fConfigCcdbPathTPC.value, bcs.begin().timestamp());
1696-
VarManager::SetCalibrationObject(VarManager::kTPCElectronMean, calibList->FindObject("mean_map_electron"));
1697-
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigma, calibList->FindObject("sigma_map_electron"));
1698-
VarManager::SetCalibrationObject(VarManager::kTPCPionMean, calibList->FindObject("mean_map_pion"));
1699-
VarManager::SetCalibrationObject(VarManager::kTPCPionSigma, calibList->FindObject("sigma_map_pion"));
1700-
VarManager::SetCalibrationObject(VarManager::kTPCProtonMean, calibList->FindObject("mean_map_proton"));
1701-
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigma, calibList->FindObject("sigma_map_proton"));
1696+
VarManager::SetCalibrationObject(VarManager::kTPCElectronMeanData, calibList->FindObject("mean_map_electron"));
1697+
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigmaData, calibList->FindObject("sigma_map_electron"));
1698+
VarManager::SetCalibrationObject(VarManager::kTPCPionMeanData, calibList->FindObject("mean_map_pion"));
1699+
VarManager::SetCalibrationObject(VarManager::kTPCPionSigmaData, calibList->FindObject("sigma_map_pion"));
1700+
VarManager::SetCalibrationObject(VarManager::kTPCProtonMeanData, calibList->FindObject("mean_map_proton"));
1701+
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigmaData, calibList->FindObject("sigma_map_proton"));
17021702
if (fConfigPostCalibTPC.fConfigComputeTPCpostCalibKaon) {
1703-
VarManager::SetCalibrationObject(VarManager::kTPCKaonMean, calibList->FindObject("mean_map_kaon"));
1704-
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigma, calibList->FindObject("sigma_map_kaon"));
1703+
VarManager::SetCalibrationObject(VarManager::kTPCKaonMeanData, calibList->FindObject("mean_map_kaon"));
1704+
VarManager::SetCalibrationObject(VarManager::kTPCKaonSigmaData, calibList->FindObject("sigma_map_kaon"));
17051705
}
17061706
if (fConfigPostCalibTPC.fConfigTPCpostCalibType == 2) {
1707-
VarManager::SetCalibrationObject(VarManager::kTPCElectronStatus, calibList->FindObject("status_map_electron"));
1708-
VarManager::SetCalibrationObject(VarManager::kTPCPionStatus, calibList->FindObject("status_map_pion"));
1709-
VarManager::SetCalibrationObject(VarManager::kTPCProtonStatus, calibList->FindObject("status_map_proton"));
1707+
VarManager::SetCalibrationObject(VarManager::kTPCElectronStatusData, calibList->FindObject("status_map_electron"));
1708+
VarManager::SetCalibrationObject(VarManager::kTPCPionStatusData, calibList->FindObject("status_map_pion"));
1709+
VarManager::SetCalibrationObject(VarManager::kTPCProtonStatusData, calibList->FindObject("status_map_proton"));
17101710
if (fConfigPostCalibTPC.fConfigComputeTPCpostCalibKaon) {
1711-
VarManager::SetCalibrationObject(VarManager::kTPCKaonStatus, calibList->FindObject("status_map_kaon"));
1711+
VarManager::SetCalibrationObject(VarManager::kTPCKaonStatusData, calibList->FindObject("status_map_kaon"));
17121712
}
17131713
}
17141714
VarManager::SetCalibrationType(fConfigPostCalibTPC.fConfigTPCpostCalibType, fConfigPostCalibTPC.fConfigTPCuseInterpolatedCalib);

‎PWGDQ/Tasks/DalitzSelection.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,12 @@ struct DalitzSelection {
444444

445445
if (fConfigOptions.fConfigComputeTPCpostCalib) {
446446
auto calibList = fCCDB->getForTimeStamp<TList>(fConfigOptions.fConfigCcdbPathTPC.value, bc.timestamp());
447-
VarManager::SetCalibrationObject(VarManager::kTPCElectronMean, calibList->FindObject("mean_map_electron"));
448-
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigma, calibList->FindObject("sigma_map_electron"));
449-
VarManager::SetCalibrationObject(VarManager::kTPCPionMean, calibList->FindObject("mean_map_pion"));
450-
VarManager::SetCalibrationObject(VarManager::kTPCPionSigma, calibList->FindObject("sigma_map_pion"));
451-
VarManager::SetCalibrationObject(VarManager::kTPCProtonMean, calibList->FindObject("mean_map_proton"));
452-
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigma, calibList->FindObject("sigma_map_proton"));
447+
VarManager::SetCalibrationObject(VarManager::kTPCElectronMeanData, calibList->FindObject("mean_map_electron"));
448+
VarManager::SetCalibrationObject(VarManager::kTPCElectronSigmaData, calibList->FindObject("sigma_map_electron"));
449+
VarManager::SetCalibrationObject(VarManager::kTPCPionMeanData, calibList->FindObject("mean_map_pion"));
450+
VarManager::SetCalibrationObject(VarManager::kTPCPionSigmaData, calibList->FindObject("sigma_map_pion"));
451+
VarManager::SetCalibrationObject(VarManager::kTPCProtonMeanData, calibList->FindObject("mean_map_proton"));
452+
VarManager::SetCalibrationObject(VarManager::kTPCProtonSigmaData, calibList->FindObject("sigma_map_proton"));
453453
}
454454
fCurrentRun = bc.runNumber();
455455
}

0 commit comments

Comments
 (0)