Skip to content

[PWGDQ] Please consider the following formatting changes to #10888 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 3 commits into from
Closed

[PWGDQ] Please consider the following formatting changes to #10888 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
175f3e2
remove unused aod in dqflow
zjxiongOvO Apr 16, 2025
5daa113
remove unused code
zjxiongOvO Apr 16, 2025
d80a718
Please consider the following formatting changes
alibuild Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 0 additions & 73 deletions PWGDQ/Core/VarManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int, int> VarManager::fgRunMap;
TString VarManager::fgRunStr = "";
std::vector<int> VarManager::fgRunList = {0};
float VarManager::fgCenterOfMassEnergy = 13600; // GeV
float VarManager::fgMassofCollidingParticle = 9.382720; // GeV
float VarManager::fgTPCInterSectorBoundary = 1.0; // cm
Expand Down Expand Up @@ -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<int> 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<int>(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)
{
Expand All @@ -196,9 +130,6 @@ 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<int>(values[kRunNo])] : 0);
}
}

//__________________________________________________________________
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down
30 changes: 0 additions & 30 deletions PWGDQ/Core/VarManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ class VarManager : public TObject
kNothing = -1,
// Run wise variables
kRunNo = 0,
kRunId,
kRunIndex,
kNRunWiseVariables,

// Event wise variables
Expand Down Expand Up @@ -898,29 +896,6 @@ class VarManager : public TObject
return false;
}

static void SetRunNumbers(int n, int* runs);
static void SetRunNumbers(std::vector<int> 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);

Expand Down Expand Up @@ -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<int, int> 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<int> 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
Expand Down Expand Up @@ -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 <uint32_t fillMap, typename T>
Expand Down Expand Up @@ -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();
Expand Down
8 changes: 0 additions & 8 deletions PWGDQ/TableProducer/tableMaker.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ struct TableMaker {
Configurable<bool> fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas(electrons, pions, protons)"};
Configurable<bool> fConfigComputeTPCpostCalibKaon{"cfgTPCpostCalibKaon", false, "If true, compute TPC post-calibrated n-sigmas for kaons"};
Configurable<bool> fConfigIsOnlyforMaps{"cfgIsforMaps", false, "If true, run for postcalibration maps only"};
Configurable<bool> fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"};
Configurable<int> fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"};
Configurable<bool> fPropMuon{"cfgPropMuon", false, "Propgate muon tracks through absorber"};
Configurable<std::string> geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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<TEventFillMap>(collision); // extract event information and place it in the fValues array
if (fDoDetailedQA) {
fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues);
Expand Down Expand Up @@ -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<TEventFillMap>(collision); // extract event information and place it in the fValues array
if (fDoDetailedQA) {
fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues);
Expand Down
6 changes: 0 additions & 6 deletions PWGDQ/TableProducer/tableMaker_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,6 @@ struct TableMaker {
Configurable<bool> fConfigComputeTPCpostCalibKaon{"cfgTPCpostCalibKaon", false, "If true, compute TPC post-calibrated n-sigmas for kaons"};
Configurable<bool> fConfigIsOnlyforMaps{"cfgIsforMaps", false, "If true, run for postcalibration maps only"};
Configurable<bool> fConfigSaveElectronSample{"cfgSaveElectronSample", false, "If true, only save electron sample"};
Configurable<bool> fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"};
Configurable<int> fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"};
} fConfigPostCalibTPC;

struct : ConfigurableGroup {
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,6 @@ struct AnalysisTrackSelection {
Configurable<int64_t> fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
Configurable<bool> fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"};
Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
Configurable<bool> fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"};
Configurable<int> fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"};

Configurable<std::string> fConfigMCSignals{"cfgTrackMCSignals", "", "Comma separated list of MC signals"};
Configurable<std::string> fConfigMCSignalsJSON{"cfgTrackMCsignalsJSON", "", "Additional list of MC signals via JSON"};
Expand Down Expand Up @@ -493,9 +491,6 @@ struct AnalysisTrackSelection {
fOutputList.setObject(fHistMan->GetMainHistogramList());
}

if (fConfigDummyRunlist) {
VarManager::SetDummyRunlist(fConfigInitRunNumber);
}
if (fConfigComputeTPCpostCalib) {
fCCDB->setURL(fConfigCcdbUrl.value);
fCCDB->setCaching(true);
Expand Down
21 changes: 12 additions & 9 deletions PWGDQ/Tasks/dqFlow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,18 @@ using MyEventsWithCentRun3 = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT
// using MyEventsWithCentQvectRun3 = soa::Join<aod::Collisions, aod::EvSels, aod::QvectorFT0CVecs, aod::QvectorFT0AVecs, aod::QvectorFT0MVecs, aod::QvectorFV0AVecs, aod::QvectorTPCposVecs, aod::QvectorTPCnegVecs, aod::QvectorTPCallVecs, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs>;
using MyEventsWithCentQvectRun3 = soa::Join<aod::Collisions, aod::EvSels, aod::QvectorFT0Cs, aod::QvectorFT0As, aod::QvectorFT0Ms, aod::QvectorFV0As, aod::QvectorTPCposs, aod::QvectorTPCnegs, aod::QvectorTPCalls, aod::CentFV0As, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs>;

using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension,
aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
aod::pidTPCFullKa, aod::pidTPCFullPr,
aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension, aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
aod::pidTPCFullKa, aod::pidTPCFullPr,
aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
// using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension,
// aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
// aod::pidTPCFullKa, aod::pidTPCFullPr,
// aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
// aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
// using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension, aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
// aod::pidTPCFullKa, aod::pidTPCFullPr,
// aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
// aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>i;

using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension>;
using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension>;
using MyTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection>>;
using MyMuons = aod::FwdTracks;
using MyMuonsWithCov = soa::Join<aod::FwdTracks, aod::FwdTracksCov>;
Expand Down
5 changes: 0 additions & 5 deletions PWGDQ/Tasks/tableReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,6 @@ struct AnalysisTrackSelection {
Configurable<int64_t> fConfigNoLaterThan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
Configurable<bool> fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"};
Configurable<std::string> fConfigRunPeriods{"cfgRunPeriods", "LHC22f", "run periods for used data"};
Configurable<bool> fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"};
Configurable<int> fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"};

Service<o2::ccdb::BasicCCDBManager> fCCDB;

Expand Down Expand Up @@ -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);
Expand Down
5 changes: 0 additions & 5 deletions PWGDQ/Tasks/tableReader_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ struct AnalysisTrackSelection {

Configurable<bool> fConfigComputeTPCpostCalib{"cfgTPCpostCalib", false, "If true, compute TPC post-calibrated n-sigmas"};
Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
Configurable<bool> fConfigDummyRunlist{"cfgDummyRunlist", false, "If true, use dummy runlist"};
Configurable<int> fConfigInitRunNumber{"cfgInitRunNumber", 543215, "Initial run number used in run by run checks"};
// Track related options
Configurable<bool> fPropTrack{"cfgPropTrack", true, "Propgate tracks to associated collision to recalculate DCA and momentum vector"};

Expand Down Expand Up @@ -547,9 +545,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);
Expand Down
Loading