Skip to content

Commit 9094009

Browse files
committed
adding fix for DQ jet tables
1 parent f93e4e1 commit 9094009

2 files changed

Lines changed: 19 additions & 19 deletions

File tree

PWGJE/DataModel/JetReducedDataDQ.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,29 +154,29 @@ namespace jdummydq
154154
DECLARE_SOA_COLUMN(DummyDQ, dummyDQ, bool);
155155

156156
} // namespace jdummydq
157-
DECLARE_SOA_TABLE(JDielectron1Dummys, "AOD", "JDIEL1DUMMY",
158-
jdummydq::DummyDQ,
159-
o2::soa::Marker<1>);
157+
DECLARE_SOA_TABLE_STAGED(JDielectron1Dummys, "JDIEL1DUMMY",
158+
jdummydq::DummyDQ,
159+
o2::soa::Marker<1>);
160160

161-
DECLARE_SOA_TABLE(JDielectron2Dummys, "AOD", "JDIEL2DUMMY",
162-
jdummydq::DummyDQ,
163-
o2::soa::Marker<2>);
161+
DECLARE_SOA_TABLE_STAGED(JDielectron2Dummys, "JDIEL2DUMMY",
162+
jdummydq::DummyDQ,
163+
o2::soa::Marker<2>);
164164

165-
DECLARE_SOA_TABLE(JDielectron3Dummys, "AOD", "JDIEL3DUMMY",
166-
jdummydq::DummyDQ,
167-
o2::soa::Marker<3>);
165+
DECLARE_SOA_TABLE_STAGED(JDielectron3Dummys, "JDIEL3DUMMY",
166+
jdummydq::DummyDQ,
167+
o2::soa::Marker<3>);
168168

169-
DECLARE_SOA_TABLE(JDielectron4Dummys, "AOD", "JDIEL4DUMMY",
170-
jdummydq::DummyDQ,
171-
o2::soa::Marker<4>);
169+
DECLARE_SOA_TABLE_STAGED(JDielectron4Dummys, "JDIEL4DUMMY",
170+
jdummydq::DummyDQ,
171+
o2::soa::Marker<4>);
172172

173-
DECLARE_SOA_TABLE(JDielectron5Dummys, "AOD", "JDIEL5DUMMY",
174-
jdummydq::DummyDQ,
175-
o2::soa::Marker<5>);
173+
DECLARE_SOA_TABLE_STAGED(JDielectron5Dummys, "JDIEL5DUMMY",
174+
jdummydq::DummyDQ,
175+
o2::soa::Marker<5>);
176176

177-
DECLARE_SOA_TABLE(JDielectron6Dummys, "AOD", "JDIEL6DUMMY",
178-
jdummydq::DummyDQ,
179-
o2::soa::Marker<6>);
177+
DECLARE_SOA_TABLE_STAGED(JDielectron6Dummys, "JDIEL6DUMMY",
178+
jdummydq::DummyDQ,
179+
o2::soa::Marker<6>);
180180

181181
} // namespace o2::aod
182182

PWGJE/Tasks/jetSubstructureDielectronOutput.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ using namespace o2;
3232
using namespace o2::framework;
3333
using namespace o2::framework::expressions;
3434

35-
using JetSubstructureOutputDielectron = JetSubstructureHFOutputTask<aod::CollisionsDielectron, soa::Join<aod::McCollisionsDielectron, aod::JDielectronMcRCollDummys>, aod::McCollisionsDielectron, aod::CandidatesDielectronData, aod::CandidatesDielectronMCD, aod::CandidatesDielectronMCP, aod::BkgDielectronRhos, aod::BkgDielectronMcRhos, aod::JTrackDielectronSubs, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs>, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs, aod::DielectronChargedJetsMatchedToDielectronChargedEventWiseSubtractedJets>, aod::DielectronCJetRs, soa::Join<aod::DielectronChargedSPs, aod::DielectronChargedSPsMatchedToDielectronChargedEventWiseSubtractedSPs>, soa::Join<aod::DielectronChargedPRs, aod::DielectronChargedPRsMatchedToDielectronChargedEventWiseSubtractedPRs>, aod::DielectronCJetCOs, aod::DielectronCJetOs, aod::DielectronCJetSSOs, aod::DielectronCJetMOs, aod::DielectronCJetROs, soa::Join<aod::DielectronChargedMCDetectorLevelJets, aod::DielectronChargedMCDetectorLevelJetConstituents, aod::DielectronCMCDJetSSs, aod::DielectronChargedMCDetectorLevelJetsMatchedToDielectronChargedMCParticleLevelJets>, aod::DielectronCMCDJetRs, soa::Join<aod::DielectronChargedMCDetectorLevelSPs, aod::DielectronChargedMCDetectorLevelSPsMatchedToDielectronChargedMCParticleLevelSPs>, soa::Join<aod::DielectronChargedMCDetectorLevelPRs, aod::DielectronChargedMCDetectorLevelPRsMatchedToDielectronChargedMCParticleLevelPRs>, aod::DielectronCMCDJetCOs, aod::DielectronCMCDJetOs, aod::DielectronCMCDJetSSOs, aod::DielectronCMCDJetMOs, aod::DielectronCMCDJetROs, aod::DielectronCMCDJetRMOs, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs>, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs, aod::DielectronChargedMCParticleLevelJetsMatchedToDielectronChargedMCDetectorLevelJets>, aod::DielectronCMCPJetRs, soa::Join<aod::DielectronChargedMCParticleLevelSPs, aod::DielectronChargedMCParticleLevelSPsMatchedToDielectronChargedMCDetectorLevelSPs>, soa::Join<aod::DielectronChargedMCParticleLevelPRs, aod::DielectronChargedMCParticleLevelPRsMatchedToDielectronChargedMCDetectorLevelPRs>, aod::DielectronCMCPJetCOs, aod::DielectronCMCPJetMCCOs, aod::DielectronCMCPJetOs, aod::DielectronCMCPJetSSOs, aod::DielectronCMCPJetMOs, aod::DielectronCMCPJetROs, aod::DielectronCMCPJetRMOs, soa::Join<aod::DielectronChargedEventWiseSubtractedJets, aod::DielectronChargedEventWiseSubtractedJetConstituents, aod::DielectronCEWSJetSSs, aod::DielectronChargedEventWiseSubtractedJetsMatchedToDielectronChargedJets>, soa::Join<aod::DielectronChargedEventWiseSubtractedSPs, aod::DielectronChargedEventWiseSubtractedSPsMatchedToDielectronChargedSPs>, soa::Join<aod::DielectronChargedEventWiseSubtractedPRs, aod::DielectronChargedEventWiseSubtractedPRsMatchedToDielectronChargedPRs>, aod::DielectronCEWSJetCOs, aod::DielectronCEWSJetOs, aod::DielectronCEWSJetSSOs, aod::DielectronCEWSJetMOs, aod::StoredReducedEvents, aod::StoredDielectrons, aod::StoredDielectronsAll, aod::JDielectron1Dummys, aod::JDielectron2Dummys, aod::JDielectron3Dummys, aod::JDielectron4Dummys, aod::JDielectron5Dummys, aod::JDielectron6Dummys, aod::StoredJDielectronMcCollisions, aod::JDielectronMcRCollDummys, aod::StoredJDielectronMcs>;
35+
using JetSubstructureOutputDielectron = JetSubstructureHFOutputTask<aod::CollisionsDielectron, soa::Join<aod::McCollisionsDielectron, aod::JDielectronMcRCollDummys>, aod::McCollisionsDielectron, aod::CandidatesDielectronData, aod::CandidatesDielectronMCD, aod::CandidatesDielectronMCP, aod::BkgDielectronRhos, aod::BkgDielectronMcRhos, aod::JTrackDielectronSubs, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs>, soa::Join<aod::DielectronChargedJets, aod::DielectronChargedJetConstituents, aod::DielectronCJetSSs, aod::DielectronChargedJetsMatchedToDielectronChargedEventWiseSubtractedJets>, aod::DielectronCJetRs, soa::Join<aod::DielectronChargedSPs, aod::DielectronChargedSPsMatchedToDielectronChargedEventWiseSubtractedSPs>, soa::Join<aod::DielectronChargedPRs, aod::DielectronChargedPRsMatchedToDielectronChargedEventWiseSubtractedPRs>, aod::DielectronCJetCOs, aod::DielectronCJetOs, aod::DielectronCJetSSOs, aod::DielectronCJetMOs, aod::DielectronCJetROs, soa::Join<aod::DielectronChargedMCDetectorLevelJets, aod::DielectronChargedMCDetectorLevelJetConstituents, aod::DielectronCMCDJetSSs, aod::DielectronChargedMCDetectorLevelJetsMatchedToDielectronChargedMCParticleLevelJets>, aod::DielectronCMCDJetRs, soa::Join<aod::DielectronChargedMCDetectorLevelSPs, aod::DielectronChargedMCDetectorLevelSPsMatchedToDielectronChargedMCParticleLevelSPs>, soa::Join<aod::DielectronChargedMCDetectorLevelPRs, aod::DielectronChargedMCDetectorLevelPRsMatchedToDielectronChargedMCParticleLevelPRs>, aod::DielectronCMCDJetCOs, aod::DielectronCMCDJetOs, aod::DielectronCMCDJetSSOs, aod::DielectronCMCDJetMOs, aod::DielectronCMCDJetROs, aod::DielectronCMCDJetRMOs, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs>, soa::Join<aod::DielectronChargedMCParticleLevelJets, aod::DielectronChargedMCParticleLevelJetConstituents, aod::DielectronCMCPJetSSs, aod::DielectronChargedMCParticleLevelJetsMatchedToDielectronChargedMCDetectorLevelJets>, aod::DielectronCMCPJetRs, soa::Join<aod::DielectronChargedMCParticleLevelSPs, aod::DielectronChargedMCParticleLevelSPsMatchedToDielectronChargedMCDetectorLevelSPs>, soa::Join<aod::DielectronChargedMCParticleLevelPRs, aod::DielectronChargedMCParticleLevelPRsMatchedToDielectronChargedMCDetectorLevelPRs>, aod::DielectronCMCPJetCOs, aod::DielectronCMCPJetMCCOs, aod::DielectronCMCPJetOs, aod::DielectronCMCPJetSSOs, aod::DielectronCMCPJetMOs, aod::DielectronCMCPJetROs, aod::DielectronCMCPJetRMOs, soa::Join<aod::DielectronChargedEventWiseSubtractedJets, aod::DielectronChargedEventWiseSubtractedJetConstituents, aod::DielectronCEWSJetSSs, aod::DielectronChargedEventWiseSubtractedJetsMatchedToDielectronChargedJets>, soa::Join<aod::DielectronChargedEventWiseSubtractedSPs, aod::DielectronChargedEventWiseSubtractedSPsMatchedToDielectronChargedSPs>, soa::Join<aod::DielectronChargedEventWiseSubtractedPRs, aod::DielectronChargedEventWiseSubtractedPRsMatchedToDielectronChargedPRs>, aod::DielectronCEWSJetCOs, aod::DielectronCEWSJetOs, aod::DielectronCEWSJetSSOs, aod::DielectronCEWSJetMOs, aod::StoredReducedEvents, aod::StoredDielectrons, aod::StoredDielectronsAll, aod::StoredJDielectron1Dummys, aod::StoredJDielectron2Dummys, aod::StoredJDielectron3Dummys, aod::StoredJDielectron4Dummys, aod::StoredJDielectron5Dummys, aod::StoredJDielectron6Dummys, aod::StoredJDielectronMcCollisions, aod::StoredJDielectronMcRCollDummys, aod::StoredJDielectronMcs>;
3636

3737
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
3838
{

0 commit comments

Comments
 (0)