Skip to content

Commit 171d571

Browse files
ananthapadmanabhan18ananthapadmanabhan18
authored
Merge branch 'AliceO2Group:master' into master
2 parents a3e1777 + fc1a93d commit 171d571

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2730
-862
lines changed

‎Common/CCDB/ctpRateFetcher.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ double ctpRateFetcher::fetchCTPratesClasses(o2::ccdb::BasicCCDBManager* /*ccdb*/
6969
LOG(warn) << "Trigger class " << className << " not found in CTPConfiguration";
7070
return -1.;
7171
}
72-
auto rate{mScalers->getRateGivenT(timeStamp * 1.e-3, classIndex, inputType)};
72+
auto rate{mScalers->getRateGivenT(timeStamp * 1.e-3, classIndex, inputType, 1)};
7373
return pileUpCorrection(rate.second);
7474
}
7575

7676
double ctpRateFetcher::fetchCTPratesInputs(o2::ccdb::BasicCCDBManager* /*ccdb*/, uint64_t timeStamp, int /*runNumber*/, int input)
7777
{
7878
std::vector<ctp::CTPScalerRecordO2> recs = mScalers->getScalerRecordO2();
7979
if (recs[0].scalersInps.size() == 48) {
80-
return pileUpCorrection(mScalers->getRateGivenT(timeStamp * 1.e-3, input, 7).second);
80+
return pileUpCorrection(mScalers->getRateGivenT(timeStamp * 1.e-3, input, 7, 1).second);
8181
} else {
8282
LOG(error) << "Inputs not available";
8383
return -1.;

‎Common/Core/MetadataHelper.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11-
12-
///
1311
/// \file TableHelper.h
1412
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
1513
/// \brief Utility to handle the metadata from the AOD
@@ -70,6 +68,4 @@ struct MetadataHelper {
7068

7169
} // namespace o2::common::core
7270

73-
using MetadataHelper = o2::common::core::MetadataHelper; // Alias for the MetadataHelper
74-
7571
#endif // COMMON_CORE_METADATAHELPER_H_

‎Common/Tools/MultModule.h‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -452,16 +452,6 @@ class MultModule
452452
}
453453
}
454454

455-
opts = internalOpts;
456-
457-
// list enabled tables
458-
for (int i = 0; i < nTablesConst; i++) {
459-
// printout to be improved in the future
460-
if (internalOpts.mEnabledTables[i]) {
461-
LOGF(info, " -~> Table enabled: %s, requested by %s", tableNames[i], listOfRequestors[i].Data());
462-
}
463-
}
464-
465455
// dependency checker
466456
if (internalOpts.mEnabledTables[kCentFV0As] && !internalOpts.mEnabledTables[kFV0MultZeqs]) {
467457
internalOpts.mEnabledTables[kFV0MultZeqs] = 1;
@@ -488,6 +478,14 @@ class MultModule
488478
listOfRequestors[kPVMults].Append(Form("%s ", "dependency check"));
489479
}
490480

481+
// list enabled tables
482+
for (int i = 0; i < nTablesConst; i++) {
483+
// printout to be improved in the future
484+
if (internalOpts.mEnabledTables[i]) {
485+
LOGF(info, " -~> Table enabled: %s, requested by %s", tableNames[i], listOfRequestors[i].Data());
486+
}
487+
}
488+
491489
// capture the need for PYTHIA calibration in Pb-Pb runs
492490
if (metadataInfo.isMC() && mRunNumber >= 544013 && mRunNumber <= 545367) {
493491
internalOpts.generatorName.value = "PYTHIA";
@@ -502,6 +500,9 @@ class MultModule
502500
hVtxZFDDA = nullptr;
503501
hVtxZFDDC = nullptr;
504502
hVtxZNTracks = nullptr;
503+
504+
// pass to the outside
505+
opts = internalOpts;
505506
}
506507

507508
//__________________________________________________

‎EventFiltering/PWGEM/EMPhotonFilter.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,19 @@
1212
// \brief software trigger for EM photon
1313
// \author daiki.sekihata@cern.ch
1414

15-
#include "Math/Vector4D.h"
16-
#include "Framework/runDataProcessing.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/AnalysisDataModel.h"
19-
#include "Framework/ASoAHelpers.h"
20-
#include "Common/DataModel/CaloClusters.h"
21-
#include "DataFormatsPHOS/TriggerRecord.h"
2215
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
16+
17+
#include "Common/DataModel/CaloClusters.h"
2318
#include "EventFiltering/filterTables.h"
19+
20+
#include "DataFormatsPHOS/TriggerRecord.h"
21+
#include "Framework/ASoAHelpers.h"
22+
#include "Framework/AnalysisDataModel.h"
23+
#include "Framework/AnalysisTask.h"
2424
#include "Framework/HistogramRegistry.h"
25+
#include "Framework/runDataProcessing.h"
26+
27+
#include "Math/Vector4D.h"
2528

2629
using namespace o2;
2730
using namespace o2::soa;
@@ -325,13 +328,10 @@ struct EMPhotonFilter {
325328
} // end of collision loop
326329
}
327330

328-
Filter PCMFilter = o2::aod::v0photonkf::dcaXYtopv < max_dcatopv_xy_v0 && o2::aod::v0photonkf::dcaZtopv < max_dcatopv_z_v0;
329-
using filteredV0PhotonsKF = Filtered<aod::V0PhotonsKF>;
330-
331331
Filter DalitzEEFilter = o2::aod::dalitzee::sign == 0; // analyze only uls
332332
using filteredDalitzEEs = Filtered<aod::DalitzEEs>;
333333

334-
void process_PCM(MyCollisions const& collisions, filteredV0PhotonsKF const& v0photons, aod::V0Legs const& v0legs, filteredDalitzEEs const& dielectrons, MyPrimaryElectrons const& emprimaryelectrons)
334+
void process_PCM(MyCollisions const& collisions, aod::V0PhotonsKF const& v0photons, aod::V0Legs const& v0legs, filteredDalitzEEs const& dielectrons, MyPrimaryElectrons const& emprimaryelectrons)
335335
{
336336
const uint8_t system = EM_Filter_PhotonType::kPCM;
337337
runFilter<system>(collisions, v0photons, nullptr, nullptr, v0legs, dielectrons, emprimaryelectrons);
@@ -351,7 +351,7 @@ struct EMPhotonFilter {
351351
runFilter<system>(collisions, nullptr, nullptr, clusters, nullptr, nullptr, nullptr);
352352
}
353353

354-
void process_PCM_PHOS(MyCollisions const& collisions, filteredV0PhotonsKF const& v0photons, aod::V0Legs const& v0legs, filteredDalitzEEs const& dielectrons, MyPrimaryElectrons const& emprimaryelectrons, CluCandidates const& clusters)
354+
void process_PCM_PHOS(MyCollisions const& collisions, aod::V0PhotonsKF const& v0photons, aod::V0Legs const& v0legs, filteredDalitzEEs const& dielectrons, MyPrimaryElectrons const& emprimaryelectrons, CluCandidates const& clusters)
355355
{
356356
const uint8_t system = EM_Filter_PhotonType::kPCM | EM_Filter_PhotonType::kPHOS;
357357
runFilter<system>(collisions, v0photons, clusters, nullptr, v0legs, dielectrons, emprimaryelectrons);

‎PWGCF/Flow/Tasks/flowGfwOmegaXi.cxx‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,27 +1205,12 @@ struct FlowGfwOmegaXi {
12051205
((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Kaon>(bachelor)) < cfgNSigma[8]) || bachelor.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Proton>(posdau)) < cfgNSigma[7]) || posdau.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(negdau)) < cfgNSigma[6]) || negdau.pt() < lowpt)) {
12061206
registry.fill(HIST("InvMassOmega_all"), casc.pt(), casc.mOmega(), casc.eta(), cent);
12071207
isOmega = true;
1208-
1209-
setCurrentParticleWeights(weff, wacc, bachelor, vtxz, 0);
1210-
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), wacc * weff * wloc, 4096);
1211-
setCurrentParticleWeights(weff, wacc, posdau, vtxz, 0);
1212-
fGFW->Fill(posdau.eta(), 1, posdau.phi(), wacc * weff * wloc, 4096);
1213-
setCurrentParticleWeights(weff, wacc, negdau, vtxz, 0);
1214-
fGFW->Fill(negdau.eta(), 1, negdau.phi(), wacc * weff * wloc, 4096);
1215-
12161208
} else if (casc.sign() > 0 && std::fabs(casc.yOmega()) < cfgCasc_rapidity &&
12171209
(std::fabs(bachelor.tpcNSigmaKa()) < cfgNSigma[2] && std::fabs(negdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(posdau.tpcNSigmaPi()) < cfgNSigma[0]) &&
12181210
((std::fabs(bachelor.tofNSigmaKa()) < cfgNSigma[5] || bachelor.pt() < lowpt) && (std::fabs(negdau.tofNSigmaPr()) < cfgNSigma[4] || negdau.pt() < lowpt) && (std::fabs(posdau.tofNSigmaPi()) < cfgNSigma[3] || posdau.pt() < lowpt)) &&
12191211
((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Kaon>(bachelor)) < cfgNSigma[8]) || bachelor.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Proton>(posdau)) < cfgNSigma[7]) || posdau.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(negdau)) < cfgNSigma[6]) || negdau.pt() < lowpt)) {
12201212
registry.fill(HIST("InvMassOmega_all"), casc.pt(), casc.mOmega(), casc.eta(), cent);
12211213
isOmega = true;
1222-
1223-
setCurrentParticleWeights(weff, wacc, bachelor, vtxz, 0);
1224-
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), wacc * weff * wloc, 4096);
1225-
setCurrentParticleWeights(weff, wacc, posdau, vtxz, 0);
1226-
fGFW->Fill(posdau.eta(), 1, posdau.phi(), wacc * weff * wloc, 4096);
1227-
setCurrentParticleWeights(weff, wacc, negdau, vtxz, 0);
1228-
fGFW->Fill(negdau.eta(), 1, negdau.phi(), wacc * weff * wloc, 4096);
12291214
}
12301215
}
12311216
// Xi and antiXi
@@ -1236,27 +1221,12 @@ struct FlowGfwOmegaXi {
12361221
((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(bachelor)) < cfgNSigma[6]) || bachelor.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Proton>(posdau)) < cfgNSigma[7]) || posdau.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(negdau)) < cfgNSigma[6]) || negdau.pt() < lowpt)) {
12371222
registry.fill(HIST("InvMassXi_all"), casc.pt(), casc.mXi(), casc.eta(), cent);
12381223
isXi = true;
1239-
1240-
setCurrentParticleWeights(weff, wacc, bachelor, vtxz, 0);
1241-
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), wacc * weff * wloc, 2048);
1242-
setCurrentParticleWeights(weff, wacc, posdau, vtxz, 0);
1243-
fGFW->Fill(posdau.eta(), 1, posdau.phi(), wacc * weff * wloc, 2048);
1244-
setCurrentParticleWeights(weff, wacc, negdau, vtxz, 0);
1245-
fGFW->Fill(negdau.eta(), 1, negdau.phi(), wacc * weff * wloc, 2048);
1246-
12471224
} else if (casc.sign() > 0 && std::fabs(casc.yXi()) < cfgCasc_rapidity &&
12481225
(std::fabs(bachelor.tpcNSigmaPi()) < cfgNSigma[0] && std::fabs(negdau.tpcNSigmaPr()) < cfgNSigma[1] && std::fabs(posdau.tpcNSigmaPi()) < cfgNSigma[0]) &&
12491226
((std::fabs(bachelor.tofNSigmaPi()) < cfgNSigma[3] || bachelor.pt() < lowpt) && (std::fabs(negdau.tofNSigmaPr()) < cfgNSigma[4] || negdau.pt() < lowpt) && (std::fabs(posdau.tofNSigmaPi()) < cfgNSigma[3] || posdau.pt() < lowpt)) &&
12501227
((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(bachelor)) < cfgNSigma[6]) || bachelor.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Proton>(posdau)) < cfgNSigma[7]) || posdau.pt() < lowpt) && ((std::fabs(itsResponse.nSigmaITS<o2::track::PID::Pion>(negdau)) < cfgNSigma[6]) || negdau.pt() < lowpt)) {
12511228
registry.fill(HIST("InvMassXi_all"), casc.pt(), casc.mXi(), casc.eta(), cent);
12521229
isXi = true;
1253-
1254-
setCurrentParticleWeights(weff, wacc, bachelor, vtxz, 0);
1255-
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), wacc * weff * wloc, 2048);
1256-
setCurrentParticleWeights(weff, wacc, posdau, vtxz, 0);
1257-
fGFW->Fill(posdau.eta(), 1, posdau.phi(), wacc * weff * wloc, 2048);
1258-
setCurrentParticleWeights(weff, wacc, negdau, vtxz, 0);
1259-
fGFW->Fill(negdau.eta(), 1, negdau.phi(), wacc * weff * wloc, 2048);
12601230
}
12611231
}
12621232
// fill QA
@@ -1315,10 +1285,10 @@ struct FlowGfwOmegaXi {
13151285
if (!negdau.hasTPC() || !negdau.hasITS())
13161286
continue;
13171287
}
1318-
if (isXi && (casc.mOmega() - o2::constants::physics::MassOmegaMinus) < cascBuilderOpts.cfgcasc_compmassrej.value) {
1288+
if (isXi && std::fabs(casc.mOmega() - o2::constants::physics::MassOmegaMinus) < cascBuilderOpts.cfgcasc_compmassrej.value) {
13191289
isXi = false;
13201290
}
1321-
if (isOmega && (casc.mXi() - o2::constants::physics::MassXiMinus) < cascBuilderOpts.cfgcasc_compmassrej.value) {
1291+
if (isOmega && std::fabs(casc.mXi() - o2::constants::physics::MassXiMinus) < cascBuilderOpts.cfgcasc_compmassrej.value) {
13221292
isXi = false;
13231293
}
13241294
// fill QA
@@ -1331,9 +1301,19 @@ struct FlowGfwOmegaXi {
13311301
registry.fill(HIST("QAhisto/Casc/hqadcaCascV0dauafter"), casc.dcaV0daughters());
13321302
}
13331303

1304+
float weffBac = 1;
1305+
float weffPos = 1;
1306+
float weffNeg = 1;
1307+
float waccBac = 1;
1308+
float waccPos = 1;
1309+
float waccNeg = 1;
13341310
if (isOmega) {
1335-
if (cfgDoAccEffCorr)
1311+
if (cfgDoAccEffCorr) {
13361312
setCurrentParticleWeights(weff, wacc, casc, vtxz, 4);
1313+
setCurrentParticleWeights(weffBac, waccBac, bachelor, vtxz, 0);
1314+
setCurrentParticleWeights(weffPos, waccPos, posdau, vtxz, 0);
1315+
setCurrentParticleWeights(weffNeg, waccNeg, negdau, vtxz, 0);
1316+
}
13371317
if (cfgDoLocDenCorr) {
13381318
int phibin = -999;
13391319
phibin = hLocalDensity->FindBin(RecoDecay::constrainAngle(casc.phi(), -constants::math::PI));
@@ -1345,13 +1325,20 @@ struct FlowGfwOmegaXi {
13451325
registry.fill(HIST("hEtaPhiVtxzPOIOmega"), casc.phi(), casc.eta(), vtxz, wacc);
13461326
registry.fill(HIST("InvMassOmega"), casc.pt(), casc.mOmega(), casc.eta(), cent);
13471327
fGFW->Fill(casc.eta(), fOmegaPtAxis->FindBin(casc.pt()) - 1 + ((fOmegaMass->FindBin(casc.mOmega()) - 1) * nOmegaPtBins), casc.phi(), wacc * weff * wloc, 4);
1328+
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), waccBac * weffBac * wloc, 4096);
1329+
fGFW->Fill(posdau.eta(), 1, posdau.phi(), waccPos * weffPos * wloc, 4096);
1330+
fGFW->Fill(negdau.eta(), 1, negdau.phi(), waccNeg * weffNeg * wloc, 4096);
13481331

13491332
if (cfgOutputNUAWeights)
13501333
fWeightsOmega->fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);
13511334
}
13521335
if (isXi) {
1353-
if (cfgDoAccEffCorr)
1336+
if (cfgDoAccEffCorr) {
13541337
setCurrentParticleWeights(weff, wacc, casc, vtxz, 3);
1338+
setCurrentParticleWeights(weffBac, waccBac, bachelor, vtxz, 0);
1339+
setCurrentParticleWeights(weffPos, waccPos, posdau, vtxz, 0);
1340+
setCurrentParticleWeights(weffNeg, waccNeg, negdau, vtxz, 0);
1341+
}
13551342
if (cfgDoLocDenCorr) {
13561343
int phibin = -999;
13571344
phibin = hLocalDensity->FindBin(RecoDecay::constrainAngle(casc.phi(), -constants::math::PI));
@@ -1363,6 +1350,9 @@ struct FlowGfwOmegaXi {
13631350
registry.fill(HIST("hEtaPhiVtxzPOIXi"), casc.phi(), casc.eta(), vtxz, wacc);
13641351
registry.fill(HIST("InvMassXi"), casc.pt(), casc.mXi(), casc.eta(), cent);
13651352
fGFW->Fill(casc.eta(), fXiPtAxis->FindBin(casc.pt()) - 1 + ((fXiMass->FindBin(casc.mXi()) - 1) * nXiPtBins), casc.phi(), wacc * weff * wloc, 2);
1353+
fGFW->Fill(bachelor.eta(), 1, bachelor.phi(), waccBac * weffBac * wloc, 2048);
1354+
fGFW->Fill(posdau.eta(), 1, posdau.phi(), waccPos * weffPos * wloc, 2048);
1355+
fGFW->Fill(negdau.eta(), 1, negdau.phi(), waccNeg * weffNeg * wloc, 2048);
13661356

13671357
if (cfgOutputNUAWeights)
13681358
fWeightsXi->fill(casc.phi(), casc.eta(), vtxz, casc.pt(), cent, 0);

0 commit comments

Comments
 (0)