diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx index f9a71a28c9b..0467abfd240 100644 --- a/PWGDQ/Core/VarManager.cxx +++ b/PWGDQ/Core/VarManager.cxx @@ -28,9 +28,6 @@ bool VarManager::fgUsedVars[VarManager::kNVars] = {false}; bool VarManager::fgUsedKF = false; float VarManager::fgMagField = 0.5; float VarManager::fgValues[VarManager::kNVars] = {0.0f}; -std::map VarManager::fgRunMap; -TString VarManager::fgRunStr = ""; -std::vector VarManager::fgRunList = {0}; float VarManager::fgCenterOfMassEnergy = 13600; // GeV float VarManager::fgMassofCollidingParticle = 9.382720; // GeV float VarManager::fgTPCInterSectorBoundary = 1.0; // cm @@ -110,69 +107,6 @@ void VarManager::ResetValues(int startValue, int endValue, float* values) } } -//__________________________________________________________________ -void VarManager::SetRunNumbers(int n, int* runs) -{ - // - // maps the list of runs such that one can plot the list of runs nicely in a histogram axis - // - for (int i = 0; i < n; ++i) { - fgRunMap[runs[i]] = i + 1; - fgRunStr += Form("%d;", runs[i]); - } -} - -//__________________________________________________________________ -void VarManager::SetRunNumbers(std::vector runs) -{ - // - // maps the list of runs such that one can plot the list of runs nicely in a histogram axis - // - int i = 0; - for (auto run = runs.begin(); run != runs.end(); run++, i++) { - fgRunMap[*run] = i + 1; - fgRunStr += Form("%d;", *run); - } - fgRunList = runs; -} - -//__________________________________________________________________ -void VarManager::SetDummyRunlist(int InitRunnumber) -{ - // - // runlist for the different periods - fgRunList.clear(); - fgRunList.push_back(InitRunnumber); - fgRunList.push_back(InitRunnumber + 100); -} - -//__________________________________________________________________ -int VarManager::GetDummyFirst() -{ - // - // Get the fist index of the vector of run numbers - // - return fgRunList[0]; -} -//__________________________________________________________________ -int VarManager::GetDummyLast() -{ - // - // Get the last index of the vector of run numbers - // - return fgRunList[fgRunList.size() - 1]; -} -//_________________________________________________________________ -float VarManager::GetRunIndex(double Runnumber) -{ - // - // Get the index of RunNumber in it's runlist - // - int runNumber = static_cast(Runnumber); - auto runIndex = std::find(fgRunList.begin(), fgRunList.end(), runNumber); - float index = std::distance(fgRunList.begin(), runIndex); - return index; -} //__________________________________________________________________ void VarManager::SetCollisionSystem(TString system, float energy) { @@ -191,15 +125,12 @@ void VarManager::SetCollisionSystem(TString system, float energy) } //__________________________________________________________________ -void VarManager::FillEventDerived(float* values) -{ - // - // Fill event-wise derived quantities (these are all quantities which can be computed just based on the values already filled in the FillEvent() function) - // - if (fgUsedVars[kRunId]) { - values[kRunId] = (fgRunMap.size() > 0 ? fgRunMap[static_cast(values[kRunNo])] : 0); - } -} +// void VarManager::FillEventDerived(float* values) +// { +// // +// // Fill event-wise derived quantities (these are all quantities which can be computed just based on the values already filled in the FillEvent() function) +// // +// } //__________________________________________________________________ void VarManager::FillTrackDerived(float* values) @@ -230,8 +161,6 @@ void VarManager::SetDefaultVarNames() fgVariableNames[kRunNo] = "Run number"; fgVariableUnits[kRunNo] = ""; - fgVariableNames[kRunId] = "Run number"; - fgVariableUnits[kRunId] = ""; fgVariableNames[kBC] = "Bunch crossing"; fgVariableUnits[kBC] = ""; fgVariableNames[kTimeFromSOR] = "time since SOR"; @@ -1095,8 +1024,6 @@ void VarManager::SetDefaultVarNames() // Set the variables short names map. This is needed for dynamic configuration via JSON files fgVarNamesMap["kNothing"] = kNothing; fgVarNamesMap["kRunNo"] = kRunNo; - fgVarNamesMap["kRunId"] = kRunId; - fgVarNamesMap["kRunIndex"] = kRunIndex; fgVarNamesMap["kNRunWiseVariables"] = kNRunWiseVariables; fgVarNamesMap["kTimestamp"] = kTimestamp; fgVarNamesMap["kTimeFromSOR"] = kTimeFromSOR; diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 95269681f6c..94e3869a00c 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -175,8 +175,6 @@ class VarManager : public TObject kNothing = -1, // Run wise variables kRunNo = 0, - kRunId, - kRunIndex, kNRunWiseVariables, // Event wise variables @@ -898,29 +896,6 @@ class VarManager : public TObject return false; } - static void SetRunNumbers(int n, int* runs); - static void SetRunNumbers(std::vector runs); - static float GetRunIndex(double); - static void SetDummyRunlist(int InitRunnumber); - static int GetDummyFirst(); - static int GetDummyLast(); - static int GetDummyNRuns() - { - if (fgRunMap.size() == 0) { - return 101; - } else { - return fgRunMap.size(); - } - } - static int GetNRuns() - { - return fgRunMap.size(); - } - static TString GetRunStr() - { - return fgRunStr; - } - // Setup the collision system static void SetCollisionSystem(TString system, float energy); @@ -1159,9 +1134,6 @@ class VarManager : public TObject static void SetVariableDependencies(); // toggle those variables on which other used variables might depend static float fgMagField; - static std::map fgRunMap; // map of runs to be used in histogram axes - static TString fgRunStr; // semi-colon separated list of runs, to be used for histogram axis labels - static std::vector fgRunList; // vector of runs, to be used for histogram axis static float fgCenterOfMassEnergy; // collision energy static float fgMassofCollidingParticle; // mass of the colliding particle static float fgTPCInterSectorBoundary; // TPC inter-sector border size at the TPC outer radius, in cm @@ -1172,7 +1144,7 @@ class VarManager : public TObject static uint64_t fgSOR; // Timestamp for start of run static uint64_t fgEOR; // Timestamp for end of run - static void FillEventDerived(float* values = nullptr); + // static void FillEventDerived(float* values = nullptr); static void FillTrackDerived(float* values = nullptr); template static auto getRotatedCovMatrixXX(const T& matrix, U phi, V theta); @@ -1442,7 +1414,6 @@ void VarManager::FillBC(T const& bc, float* values) values[kBCOrbit] = bc.globalBC() % o2::constants::lhc::LHCMaxBunches; values[kTimestamp] = bc.timestamp(); values[kTimeFromSOR] = (fgSOR > 0 ? (bc.timestamp() - fgSOR) / 60000. : -1.0); - values[kRunIndex] = GetRunIndex(bc.runNumber()); } template @@ -1611,7 +1582,6 @@ void VarManager::FillEvent(T const& event, float* values) if constexpr ((fillMap & ReducedEvent) > 0) { values[kRunNo] = event.runNumber(); - values[kRunIndex] = GetRunIndex(event.runNumber()); values[kVtxX] = event.posX(); values[kVtxY] = event.posY(); values[kVtxZ] = event.posZ(); @@ -1903,7 +1873,7 @@ void VarManager::FillEvent(T const& event, float* values) FillZDC(event, values); } - FillEventDerived(values); + // FillEventDerived(values); } template diff --git a/PWGDQ/TableProducer/tableMaker.cxx b/PWGDQ/TableProducer/tableMaker.cxx index 1922ab6e1ab..f46b62ed80f 100644 --- a/PWGDQ/TableProducer/tableMaker.cxx +++ b/PWGDQ/TableProducer/tableMaker.cxx @@ -202,8 +202,6 @@ struct TableMaker { Configurable fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas(electrons, pions, protons)"}; Configurable fConfigComputeTPCpostCalibKaon{"cfgTPCpostCalibKaon", false, "If true, compute TPC post-calibrated n-sigmas for kaons"}; Configurable fConfigIsOnlyforMaps{"cfgIsforMaps", false, "If true, run for postcalibration maps only"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; Configurable fPropMuon{"cfgPropMuon", false, "Propgate muon tracks through absorber"}; Configurable geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"}; Configurable grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; @@ -329,10 +327,6 @@ struct TableMaker { } } - if (fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigInitRunNumber); - } - DefineHistograms(histClasses); // define all histograms VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill fOutputList.setObject(fHistMan->GetMainHistogramList()); @@ -436,7 +430,6 @@ struct TableMaker { VarManager::fgValues[VarManager::kRunNo] = bc.runNumber(); VarManager::fgValues[VarManager::kBC] = bc.globalBC(); VarManager::fgValues[VarManager::kTimestamp] = bc.timestamp(); - VarManager::fgValues[VarManager::kRunIndex] = VarManager::GetRunIndex(bc.runNumber()); VarManager::FillEvent(collision); // extract event information and place it in the fValues array if (fDoDetailedQA) { fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues); @@ -910,7 +903,6 @@ struct TableMaker { VarManager::fgValues[VarManager::kRunNo] = bc.runNumber(); VarManager::fgValues[VarManager::kBC] = bc.globalBC(); VarManager::fgValues[VarManager::kTimestamp] = bc.timestamp(); - VarManager::fgValues[VarManager::kRunIndex] = VarManager::GetRunIndex(bc.runNumber()); VarManager::FillEvent(collision); // extract event information and place it in the fValues array if (fDoDetailedQA) { fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues); diff --git a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx index 1d71d8b362e..eb4f35fc1fc 100644 --- a/PWGDQ/TableProducer/tableMaker_withAssoc.cxx +++ b/PWGDQ/TableProducer/tableMaker_withAssoc.cxx @@ -233,8 +233,6 @@ struct TableMaker { Configurable fConfigComputeTPCpostCalibKaon{"cfgTPCpostCalibKaon", false, "If true, compute TPC post-calibrated n-sigmas for kaons"}; Configurable fConfigIsOnlyforMaps{"cfgIsforMaps", false, "If true, run for postcalibration maps only"}; Configurable fConfigSaveElectronSample{"cfgSaveElectronSample", false, "If true, only save electron sample"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; } fConfigPostCalibTPC; struct : ConfigurableGroup { @@ -397,10 +395,6 @@ struct TableMaker { } } - if (fConfigPostCalibTPC.fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigPostCalibTPC.fConfigInitRunNumber); - } - DefineHistograms(histClasses); // define all histograms // Additional histogram via the JSON configurable TString addHistsStr = fConfigHistOutput.fConfigAddJSONHistograms.value; diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx index 99f508a8b1e..a6d69a121d1 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -394,8 +395,6 @@ struct AnalysisTrackSelection { Configurable fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"}; Configurable fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"}; Configurable grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; Configurable fConfigMCSignals{"cfgTrackMCSignals", "", "Comma separated list of MC signals"}; Configurable fConfigMCSignalsJSON{"cfgTrackMCsignalsJSON", "", "Additional list of MC signals via JSON"}; @@ -433,7 +432,7 @@ struct AnalysisTrackSelection { if (addTrackCutsStr != "") { std::vector addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data()); for (auto& t : addTrackCuts) { - fTrackCuts.push_back((AnalysisCompositeCut*)t); + fTrackCuts.push_back(reinterpret_cast(t)); } } VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill @@ -493,9 +492,6 @@ struct AnalysisTrackSelection { fOutputList.setObject(fHistMan->GetMainHistogramList()); } - if (fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigInitRunNumber); - } if (fConfigComputeTPCpostCalib) { fCCDB->setURL(fConfigCcdbUrl.value); fCCDB->setCaching(true); @@ -760,7 +756,7 @@ struct AnalysisMuonSelection { if (addCutsStr != "") { std::vector addCuts = dqcuts::GetCutsFromJSON(addCutsStr.Data()); for (auto& t : addCuts) { - fMuonCuts.push_back((AnalysisCompositeCut*)t); + fMuonCuts.push_back(reinterpret_cast(t)); } } VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill @@ -2203,7 +2199,7 @@ struct AnalysisAsymmetricPairing { if (addPairCutsStr != "") { std::vector addPairCuts = dqcuts::GetCutsFromJSON(addPairCutsStr.Data()); for (auto& t : addPairCuts) { - fPairCuts.push_back((AnalysisCompositeCut*)t); + fPairCuts.push_back(reinterpret_cast(t)); cutNamesStr += Form(",%s", t->GetName()); } } @@ -3290,7 +3286,7 @@ struct AnalysisDileptonTrack { // loop over all the upstream cuts and make a bit mask for the track cuts specified in this task for (int icut = 0; icut < cfgTrackSelection_objArrayTrackCuts->GetEntries(); icut++) { if (cfgDileptonTrack_objArrayTrackCuts->FindObject(cfgTrackSelection_objArrayTrackCuts->At(icut)->GetName())) { - fTrackCutBitMap |= (uint32_t(1) << icut); + fTrackCutBitMap |= (static_cast(1) << icut); } } // finally, store the total number of upstream tasks, for easy access @@ -3358,7 +3354,7 @@ struct AnalysisDileptonTrack { for (int iCutTrack = 0; iCutTrack < fNCuts; iCutTrack++) { // here we check that this track cut is one of those required to associate with the dileptons - if (!(fTrackCutBitMap & (uint32_t(1) << iCutTrack))) { + if (!(fTrackCutBitMap & (static_cast(1) << iCutTrack))) { continue; } @@ -3593,13 +3589,13 @@ struct AnalysisDileptonTrack { // loop over specified track cuts (the tracks to be combined with the dileptons) for (int iTrackCut = 0; iTrackCut < fNCuts; iTrackCut++) { - if (!(trackSelection & (uint32_t(1) << iTrackCut))) { + if (!(trackSelection & (static_cast(1) << iTrackCut))) { continue; } fHistMan->FillHistClass(Form("DileptonTrack_%s_%s", fTrackCutNames[icut].Data(), fTrackCutNames[iTrackCut].Data()), fValuesHadron); for (uint32_t isig = 0; isig < fRecMCSignals.size(); isig++) { - if (mcDecision & (uint32_t(1) << isig)) { + if (mcDecision & (static_cast(1) << isig)) { fHistMan->FillHistClass(Form("DileptonTrackMCMatched_%s_%s_%s", fTrackCutNames[icut].Data(), fTrackCutNames[iTrackCut].Data(), fRecMCSignals[isig]->GetName()), fValuesHadron); } } @@ -3609,7 +3605,7 @@ struct AnalysisDileptonTrack { if (dilepton.commonFilterMap_bit(fCommonTrackCutMap[iCommonCut])) { fHistMan->FillHistClass(Form("DileptonTrack_%s_%s_%s", fTrackCutNames[icut].Data(), fCommonPairCutNames[iCommonCut].Data(), fTrackCutNames[iTrackCut].Data()), fValuesHadron); for (uint32_t isig = 0; isig < fRecMCSignals.size(); isig++) { - if (mcDecision & (uint32_t(1) << isig)) { + if (mcDecision & (static_cast(1) << isig)) { fHistMan->FillHistClass(Form("DileptonTrackMCMatched_%s_%s_%s_%s", fTrackCutNames[icut].Data(), fCommonPairCutNames[iCommonCut].Data(), fTrackCutNames[iTrackCut].Data(), fRecMCSignals[isig]->GetName()), fValuesHadron); } } @@ -3619,7 +3615,7 @@ struct AnalysisDileptonTrack { if (dilepton.pairFilterMap_bit(iPairCut)) { fHistMan->FillHistClass(Form("DileptonTrack_%s_%s_%s", fTrackCutNames[icut].Data(), fPairCutNames[iPairCut].Data(), fTrackCutNames[iTrackCut].Data()), fValuesHadron); for (uint32_t isig = 0; isig < fRecMCSignals.size(); isig++) { - if (mcDecision & (uint32_t(1) << isig)) { + if (mcDecision & (static_cast(1) << isig)) { fHistMan->FillHistClass(Form("DileptonTrackMCMatched_%s_%s_%s_%s", fTrackCutNames[icut].Data(), fPairCutNames[iPairCut].Data(), fTrackCutNames[iTrackCut].Data(), fRecMCSignals[isig]->GetName()), fValuesHadron); } } @@ -3627,7 +3623,7 @@ struct AnalysisDileptonTrack { if (dilepton.commonFilterMap_bit(fCommonTrackCutMap[iCommonCut])) { fHistMan->FillHistClass(Form("DileptonTrack_%s_%s_%s_%s", fTrackCutNames[icut].Data(), fCommonPairCutNames[iCommonCut].Data(), fPairCutNames[iPairCut].Data(), fTrackCutNames[iTrackCut].Data()), fValuesHadron); for (uint32_t isig = 0; isig < fRecMCSignals.size(); isig++) { - if (mcDecision & (uint32_t(1) << isig)) { + if (mcDecision & (static_cast(1) << isig)) { fHistMan->FillHistClass(Form("DileptonTrackMCMatched_%s_%s_%s_%s_%s", fTrackCutNames[icut].Data(), fCommonPairCutNames[iCommonCut].Data(), fPairCutNames[iPairCut].Data(), fTrackCutNames[iTrackCut].Data(), fRecMCSignals[isig]->GetName()), fValuesHadron); } } diff --git a/PWGDQ/Tasks/dqFlow.cxx b/PWGDQ/Tasks/dqFlow.cxx index d9210685a2e..ad500439924 100644 --- a/PWGDQ/Tasks/dqFlow.cxx +++ b/PWGDQ/Tasks/dqFlow.cxx @@ -16,11 +16,13 @@ /// o2-analysis-timestamp --aod-file AO2D.root -b | o2-analysis-event-selection -b | o2-analysis-multiplicity-table -b | o2-analysis-centrality-table -b | o2-analysis-fdd-converter -b | o2-analysis-trackselection -b | o2-analysis-trackextension -b | o2-analysis-pid-tpc-full -b | o2-analysis-pid-tof-full -b | o2-analysis-pid-tof-base -b | o2-analysis-pid-tof-beta -b | o2-analysis-dq-flow -b /// tested (June 2, 2022) on AO2D.root files from train production 242 +#include +#include +#include +#include #include #include #include -#include -#include #include #include "CCDB/BasicCCDBManager.h" #include "Framework/runDataProcessing.h" @@ -69,15 +71,18 @@ using MyEventsWithCentRun3 = soa::Join; using MyEventsWithCentQvectRun3 = soa::Join; -using MyBarrelTracks = soa::Join; -using MyBarrelTracksWithCov = soa::Join; +// using MyBarrelTracks = soa::Join; +// using MyBarrelTracksWithCov = soa::Joini; + +using MyBarrelTracks = soa::Join; +using MyBarrelTracksWithCov = soa::Join; using MyTracks = soa::Filtered>; using MyMuons = aod::FwdTracks; using MyMuonsWithCov = soa::Join; diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 2249aba8163..eb5d6dae897 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -326,8 +326,6 @@ struct AnalysisTrackSelection { Configurable fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"}; Configurable fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"}; Configurable fConfigRunPeriods{"cfgRunPeriods", "LHC22f", "run periods for used data"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; Service fCCDB; @@ -370,9 +368,6 @@ struct AnalysisTrackSelection { VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill fOutputList.setObject(fHistMan->GetMainHistogramList()); } - if (fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigInitRunNumber); - } if (fConfigComputeTPCpostCalib) { // CCDB configuration fCCDB->setURL(fConfigCcdbUrl.value); diff --git a/PWGDQ/Tasks/tableReader_withAssoc.cxx b/PWGDQ/Tasks/tableReader_withAssoc.cxx index 5f7912211b2..7d19373fdb1 100644 --- a/PWGDQ/Tasks/tableReader_withAssoc.cxx +++ b/PWGDQ/Tasks/tableReader_withAssoc.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -486,8 +487,6 @@ struct AnalysisTrackSelection { Configurable fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"}; Configurable grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; // Track related options Configurable fPropTrack{"cfgPropTrack", true, "Propgate tracks to associated collision to recalculate DCA and momentum vector"}; @@ -522,7 +521,7 @@ struct AnalysisTrackSelection { if (addTrackCutsStr != "") { std::vector addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data()); for (auto& t : addTrackCuts) { - fTrackCuts.push_back((AnalysisCompositeCut*)t); + fTrackCuts.push_back(reinterpret_cast(t)); } } @@ -547,9 +546,6 @@ struct AnalysisTrackSelection { VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill fOutputList.setObject(fHistMan->GetMainHistogramList()); } - if (fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigInitRunNumber); - } fCCDB->setURL(fConfigCcdbUrl.value); fCCDB->setCaching(true); @@ -770,7 +766,7 @@ struct AnalysisMuonSelection { if (addCutsStr != "") { std::vector addCuts = dqcuts::GetCutsFromJSON(addCutsStr.Data()); for (auto& t : addCuts) { - fMuonCuts.push_back((AnalysisCompositeCut*)t); + fMuonCuts.push_back(reinterpret_cast(t)); } } @@ -2144,7 +2140,7 @@ struct AnalysisAsymmetricPairing { if (addPairCutsStr != "") { std::vector addPairCuts = dqcuts::GetCutsFromJSON(addPairCutsStr.Data()); for (auto& t : addPairCuts) { - fPairCuts.push_back((AnalysisCompositeCut*)t); + fPairCuts.push_back(reinterpret_cast(t)); cutNamesStr += Form(",%s", t->GetName()); } } @@ -2928,7 +2924,7 @@ struct AnalysisDileptonTrack { } for (int icut = 0; icut < cfgTrackSelection_objArrayTrackCuts->GetEntries(); icut++) { if (cfgDileptonTrack_objArrayTrackCuts->FindObject(cfgTrackSelection_objArrayTrackCuts->At(icut)->GetName())) { - fTrackCutBitMap |= (uint32_t(1) << icut); + fTrackCutBitMap |= (static_cast(1) << icut); } } fNCuts = fTrackCutNames.size(); @@ -2995,7 +2991,7 @@ struct AnalysisDileptonTrack { for (int iCutTrack = 0; iCutTrack < fNCuts; iCutTrack++) { // here we check that this track cut is one of those required to associate with the dileptons - if (!(fTrackCutBitMap & (uint32_t(1) << iCutTrack))) { + if (!(fTrackCutBitMap & (static_cast(1) << iCutTrack))) { continue; } @@ -3174,7 +3170,7 @@ struct AnalysisDileptonTrack { // loop over specified track cuts (the tracks to be combined with the dileptons) for (int iTrackCut = 0; iTrackCut < fNCuts; iTrackCut++) { - if (!(trackSelection & (uint32_t(1) << iTrackCut))) { + if (!(trackSelection & (static_cast(1) << iTrackCut))) { continue; } fHistMan->FillHistClass(Form("DileptonTrack_%s_%s", fTrackCutNames[icut].Data(), fTrackCutNames[iTrackCut].Data()), fValuesHadron); @@ -3319,7 +3315,7 @@ struct AnalysisDileptonTrack { continue; } for (uint32_t iTrackCut = 0; iTrackCut < fTrackCutNames.size(); iTrackCut++) { - if (trackSelection & (uint32_t(1) << iTrackCut)) { + if (trackSelection & (static_cast(1) << iTrackCut)) { fHistMan->FillHistClass(Form("DileptonTrackME_%s_%s", fTrackCutNames[icut].Data(), fTrackCutNames[iTrackCut].Data()), VarManager::fgValues); } } @@ -3364,7 +3360,7 @@ struct AnalysisDileptonTrack { continue; } for (uint32_t iTrackCut = 0; iTrackCut < fTrackCutNames.size(); iTrackCut++) { - if (muonSelection & (uint32_t(1) << iTrackCut)) { + if (muonSelection & (static_cast(1) << iTrackCut)) { fHistMan->FillHistClass(Form("DileptonTrackME_%s_%s", fTrackCutNames[icut].Data(), fTrackCutNames[iTrackCut].Data()), VarManager::fgValues); } } diff --git a/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx b/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx index d78ef01676c..819a85efe65 100644 --- a/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx +++ b/PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx @@ -291,8 +291,6 @@ struct AnalysisTrackSelection { Configurable fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"}; Configurable fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"}; Configurable fConfigRunPeriods{"cfgRunPeriods", "LHC22f", "run periods for used data"}; - Configurable fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"}; - Configurable fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"}; Configurable fConfigNbTrackCut{"cfgNbTrackCut", 1, "Number of cuts including prefilter cut, need to be below 30"}; std::vector fTrackCuts; @@ -372,9 +370,6 @@ struct AnalysisTrackSelection { VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill fOutputList.setObject(fHistMan->GetMainHistogramList()); } - if (fConfigDummyRunlist) { - VarManager::SetDummyRunlist(fConfigInitRunNumber); - } if (fConfigComputeTPCpostCalib) { // CCDB configuration fCCDB->setURL(fConfigCcdbUrl.value);