Skip to content

Commit aaad656

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 61f8979 commit aaad656

6 files changed

Lines changed: 40 additions & 35 deletions

File tree

‎PWGLF/DataModel/LFStrangenessTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DECLARE_SOA_TABLE(StraOrigins, "AOD", "STRAORIGIN", //! Table which contains the
4747
// for keeping track of the number of selected collisions
4848
namespace straselections
4949
{
50-
DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions
50+
DECLARE_SOA_COLUMN(TotalNbrOfCollisions, totalNbrOfCollisions, int); //! total number of analysed collisions
5151
DECLARE_SOA_COLUMN(TotalNbrOfSelCollisions, totalNbrOfSelCollisions, int); //! total number of selected collisions
5252
} // namespace straselections
5353

‎PWGLF/TableProducer/Strangeness/Converters/stradautrackstofpidconverter4.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
1919
#include "PWGLF/DataModel/LFStrangenessTables.h"
2020

21-
#include "Framework/AnalysisDataModel.h"
22-
#include "Framework/AnalysisTask.h"
23-
#include "Framework/runDataProcessing.h"
21+
#include <Framework/AnalysisDataModel.h>
22+
#include <Framework/AnalysisTask.h>
23+
#include <Framework/runDataProcessing.h>
2424

2525
using namespace o2;
2626
using namespace o2::framework;

‎PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "PWGLF/DataModel/SPCalibrationTables.h"
2626
#include "PWGUD/DataModel/UDTables.h"
2727

28+
#include "Common/CCDB/EventSelectionParams.h"
29+
#include "Common/CCDB/RCTSelectionFlags.h"
2830
#include "Common/DataModel/Centrality.h"
2931
#include "Common/DataModel/EventSelection.h"
3032
#include "Common/DataModel/McCollisionExtra.h"
@@ -33,8 +35,6 @@
3335
#include "Common/DataModel/PIDResponseTPC.h"
3436
#include "Common/DataModel/Qvectors.h"
3537
#include "Common/DataModel/TrackSelectionTables.h"
36-
#include "Common/CCDB/EventSelectionParams.h"
37-
#include "Common/CCDB/RCTSelectionFlags.h"
3838

3939
#include <Framework/AnalysisDataModel.h>
4040
#include <Framework/AnalysisHelpers.h>
@@ -195,15 +195,15 @@ struct strangederivedbuilder {
195195
Configurable<std::string> inheritEvtSelFromTask{"inheritEvtSelFromTask", "propagation-service", "Inherit event selection parameters from which task?"};
196196
Configurable<std::string> inheritEvtSelFromTaskCfgGroup{"inheritEvtSelFromTaskCfgGroup", "eventSelectOpts", "What is the configurable group prefix? If none, put nothing"};
197197
Configurable<bool> inheritEvtSelFromTaskVerbose{"inheritEvtSelFromTaskVerbose", false, "Enable verbose mode on the getTaskOption utility"};
198-
bool fillOnlySelectedCollisions = false; // Fill only tables for selected collisions?
199-
bool requireTriggerTVX = false; // require FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level (Run 3 only)
200-
bool rejectITSROFBorder = false; // reject events at ITS ROF border (Run 3 only)
201-
bool rejectTFBorder = false; // reject events at TF border (Run 3 only)
202-
bool rejectSameBunchPileup = false; // reject collisions in case of pileup with another collision in the same foundBC (Run 3 only)
203-
float maxZVtxPosition = 10.; // max Z vtx position (cm)
204-
bool cfgApplyRCTrequirement = false; // Apply RCT requirement?
205-
std::string cfgRCTLabel = ""; // Which detector condition requirements? (CBT, CBT_hadronPID, CBT_electronPID, CBT_calo, CBT_muon, CBT_muon_glo)
206-
bool cfgCheckZDC = false; // Include ZDC flags in the bit selection (for Pb-Pb only)
198+
bool fillOnlySelectedCollisions = false; // Fill only tables for selected collisions?
199+
bool requireTriggerTVX = false; // require FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level (Run 3 only)
200+
bool rejectITSROFBorder = false; // reject events at ITS ROF border (Run 3 only)
201+
bool rejectTFBorder = false; // reject events at TF border (Run 3 only)
202+
bool rejectSameBunchPileup = false; // reject collisions in case of pileup with another collision in the same foundBC (Run 3 only)
203+
float maxZVtxPosition = 10.; // max Z vtx position (cm)
204+
bool cfgApplyRCTrequirement = false; // Apply RCT requirement?
205+
std::string cfgRCTLabel = ""; // Which detector condition requirements? (CBT, CBT_hadronPID, CBT_electronPID, CBT_calo, CBT_muon, CBT_muon_glo)
206+
bool cfgCheckZDC = false; // Include ZDC flags in the bit selection (for Pb-Pb only)
207207
bool cfgTreatLimitedAcceptanceAsBad = false; // reject all events where the detectors relevant for the specified Runlist are flagged as LimitedAcceptance
208208

209209
o2::aod::rctsel::RCTFlagsChecker rctFlagsChecker;
@@ -461,7 +461,6 @@ struct strangederivedbuilder {
461461
eventSelectOptsPrefix += ".";
462462
}
463463

464-
465464
getCfg(initContext, eventSelectOptsPrefix + "fillOnlySelectedCollisions", fillOnlySelectedCollisions, inheritEvtSelFromTask);
466465
getCfg(initContext, eventSelectOptsPrefix + "requireTriggerTVX", requireTriggerTVX, inheritEvtSelFromTask);
467466
getCfg(initContext, eventSelectOptsPrefix + "rejectITSROFBorder", rejectITSROFBorder, inheritEvtSelFromTask);
@@ -481,8 +480,8 @@ struct strangederivedbuilder {
481480
LOG(info) << "Reject same bunch pile-up..........: " << (rejectSameBunchPileup ? "yes" : "no");
482481
LOG(info) << "Apply RCT requirement..............: " << (cfgApplyRCTrequirement ? "yes" : "no");
483482
LOG(info) << "RCT requirement....................: " << cfgRCTLabel;
484-
LOG(info) << "Check ZDC in RCT requirement.......: " << (cfgCheckZDC? "yes" : "no");
485-
LOG(info) << "Treat limited acceptance as bad....: " << (cfgCheckZDC? "yes" : "no");
483+
LOG(info) << "Check ZDC in RCT requirement.......: " << (cfgCheckZDC ? "yes" : "no");
484+
LOG(info) << "Treat limited acceptance as bad....: " << (cfgCheckZDC ? "yes" : "no");
486485
LOG(info) << "=================================================================";
487486

488487
// setup map for fast checking if enabled
@@ -552,7 +551,7 @@ struct strangederivedbuilder {
552551
KFCascadeCollIndices.clear();
553552
TraCascadeCollIndices.clear();
554553

555-
TrackCollIndices.resize(Tracks.size(), 0); // index -1: no collision
554+
TrackCollIndices.resize(Tracks.size(), 0); // index -1: no collision
556555
V0CollIndices.resize(V0s.size(), -1); // index -1: no collision
557556
CascadeCollIndices.resize(Cascades.size(), -1); // index -1: no collision
558557
KFCascadeCollIndices.resize(KFCascades.size(), -1); // index -1: no collision

‎PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ struct strangenesstofpid {
20842084
const double deltaTimeBc = o2::constants::lhc::LHCBunchSpacingNS * deltaBc * 1000.0f;
20852085
histos.fill(HIST("hCascadePositiveBCShift"), deltaTimeBc);
20862086
histos.fill(HIST("h2dTOFSignalCascadePositive"), pTof.tofSignal, deltaTimeBc);
2087-
2087+
20882088
pTof.tofExpMom = pTofExt.tofExpMom();
20892089
pTof.tofEvTime = reassociateTracks.value ? collision.eventTime() : pTofExt.tofEvTime();
20902090
pTof.tofEvTimeErr = reassociateTracks.value ? collision.eventTimeErr() : pTofExt.tofEvTimeErr();

‎PWGLF/Tasks/Strangeness/derivedlambdakzeroanalysis.cxx‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ struct derivedlambdakzeroanalysis {
673673
// Initialise the RCTFlagsChecker
674674
rctFlagsChecker.init(rctConfigurations.cfgRCTLabel.value, rctConfigurations.cfgCheckZDC, rctConfigurations.cfgTreatLimitedAcceptanceAsBad);
675675

676-
//
676+
//
677677
if (doprocessAnalysedCollisions) {
678678
histos.add("hEventPreSelection", "hEventPreSelection", kTH1D, {{2, -0.5f, +1.5f}});
679679
histos.get<TH1>(HIST("hEventPreSelection"))->GetXaxis()->SetBinLabel(1, "All collisions");
@@ -1274,13 +1274,19 @@ struct derivedlambdakzeroanalysis {
12741274
// Helper lambda to extract centrality from any object exposing the cent* columns
12751275
auto extractCentrality = [this](auto const& coll) -> float {
12761276
switch (centralityEstimator) {
1277-
case kCentFT0C: return coll.centFT0C();
1278-
case kCentFT0M: return coll.centFT0M();
1279-
case kCentFT0CVariant1: return coll.centFT0CVariant1();
1277+
case kCentFT0C:
1278+
return coll.centFT0C();
1279+
case kCentFT0M:
1280+
return coll.centFT0M();
1281+
case kCentFT0CVariant1:
1282+
return coll.centFT0CVariant1();
12801283
// case kCentMFT: return coll.centMFT();
1281-
case kCentNGlobal: return coll.centNGlobal();
1282-
case kCentFV0A: return coll.centFV0A();
1283-
default: return -1.f;
1284+
case kCentNGlobal:
1285+
return coll.centNGlobal();
1286+
case kCentFV0A:
1287+
return coll.centFV0A();
1288+
default:
1289+
return -1.f;
12841290
}
12851291
};
12861292

‎PWGLF/Utils/strangenessBuilderModule.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "PWGLF/DataModel/LFStrangenessTables.h" // IWYU pragma: keep
2020
#include "PWGLF/Utils/strangenessBuilderHelper.h"
2121

22+
#include "Common/CCDB/EventSelectionParams.h"
23+
#include "Common/CCDB/RCTSelectionFlags.h"
2224
#include "Common/Core/TPCVDriftManager.h"
2325

2426
#include <Framework/AnalysisDataModel.h>
@@ -32,8 +34,6 @@
3234
#include <ReconstructionDataFormats/PID.h>
3335
#include <ReconstructionDataFormats/Track.h>
3436
#include <ReconstructionDataFormats/TrackParametrization.h>
35-
#include "Common/CCDB/EventSelectionParams.h"
36-
#include "Common/CCDB/RCTSelectionFlags.h"
3737

3838
#include <TH1.h>
3939
#include <TMCProcess.h>
@@ -216,19 +216,19 @@ enum preselectParticleIndex { kGamma = 0,
216216
kXiPlus,
217217
kOmegaMinus,
218218
kOmegaPlus,
219-
nPartTypes};
219+
nPartTypes };
220220

221221
enum V0PreSelection : uint8_t { selGamma = 0,
222222
selK0Short,
223223
selLambda,
224224
selAntiLambda,
225-
nSelV0Types};
225+
nSelV0Types };
226226

227227
enum CascPreSelection : uint8_t { selXiMinus = 0,
228228
selXiPlus,
229229
selOmegaMinus,
230230
selOmegaPlus,
231-
nSelCascTypes};
231+
nSelCascTypes };
232232

233233
static constexpr float defaultK0MassWindowParameters[1][4] = {{2.81882e-03, 1.14057e-03, 1.72138e-03, 5.00262e-01}};
234234
static constexpr float defaultLambdaWindowParameters[1][4] = {{1.17518e-03, 1.24099e-04, 5.47937e-03, 3.08009e-01}};
@@ -396,10 +396,10 @@ struct cascadeConfigurables : o2::framework::ConfigurableGroup {
396396
struct preSelectOpts : o2::framework::ConfigurableGroup {
397397
std::string prefix = "preSelectOpts";
398398
o2::framework::Configurable<o2::framework::LabeledArray<int>> preselectedSpecies{"preselectedSpecies",
399-
{defaultPreselectParameters[0], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames},
400-
"Preselect this species with compatible TPC PID and mass info: 0/1 is false/true"};
399+
{defaultPreselectParameters[0], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames},
400+
"Preselect this species with compatible TPC PID and mass info: 0/1 is false/true"};
401401

402-
std::vector<int> mEnabledPreselectedSpecies; // Vector of enabled preselected particle species
402+
std::vector<int> mEnabledPreselectedSpecies; // Vector of enabled preselected particle species
403403
// lifetime preselection options
404404
// apply lifetime cuts to V0 and cascade candidates
405405
// unit of measurement: centimeters

0 commit comments

Comments
 (0)