Skip to content

Commit 6d98d8d

Browse files
vkuceravkucera
committed
Fix DQ PCH
1 parent 886200a commit 6d98d8d

10 files changed

Lines changed: 18 additions & 16 deletions

‎PWGDQ/Tasks/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
# tableReader_withAssoc.cxx is 5000 lines of task definitions, and seven
12+
# tableReader_withAssoc.h is 5000 lines of task definitions, and seven
1313
# workflow variants below #include it verbatim -- differing only in which
1414
# adaptAnalysisTask<> entries they list, with identical preprocessor state and
1515
# identical link libraries. Without this it is parsed and instantiated seven
@@ -21,7 +21,7 @@ add_library(TableReaderWithAssocPCH OBJECT tableReaderWithAssocPCH.cxx)
2121
target_link_libraries(TableReaderWithAssocPCH PUBLIC O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::MLCore)
2222
if(NOT DEFINED ENV{USE_RECC})
2323
target_precompile_headers(TableReaderWithAssocPCH PRIVATE
24-
[["PWGDQ/Tasks/tableReader_withAssoc.cxx"]])
24+
[["PWGDQ/Tasks/tableReader_withAssoc.h"]])
2525
endif()
2626

2727
o2physics_add_dpl_workflow(table-reader

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,9 +2482,9 @@ struct AnalysisSameEventPairing {
24822482
if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
24832483
isAmbiInBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29));
24842484
isAmbiOutOfBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
2485-
if (sign1 * sign2 < 0) { // +- pairs
2485+
if (sign1 * sign2 < 0) { // +- pairs
24862486
fHistMan->FillHistClass(histNames[icut][0].Data(), dqefficiency_helpers::varValues()); // reconstructed, unmatched
2487-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
2487+
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
24882488
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
24892489
PromptNonPromptSepTable(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kRap], VarManager::fgValues[VarManager::kPhi],
24902490
VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMass], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMassRecalculatePV],
@@ -2737,7 +2737,7 @@ struct AnalysisSameEventPairing {
27372737
// cout << "AnalysisSameEventPairing::runMCGen() completed" << endl;
27382738
}
27392739

2740-
// Run same-event e-mu pairing on reconstructed tracks. Logic mirrors runEmuSameEventPairing in tableReader_withAssoc.cxx
2740+
// Run same-event e-mu pairing on reconstructed tracks. Logic mirrors runEmuSameEventPairing in tableReader_withAssoc.h
27412741
// with MC matching added: for each pair we evaluate the user-supplied fEmuRecMCSignals (2-prong, leg1=e, leg2=µ)
27422742
// and fill an MC-matched histogram per (track cut, muon cut, signal) when CheckSignal returns true on the linked
27432743
// ReducedMCTracks. Mixed events are handled in runEmuMixedPairing / runEmuSameSideMixing and do not perform MC matching.
@@ -3934,7 +3934,7 @@ struct AnalysisAsymmetricPairing {
39343934
for (int icut = 0; icut < fNLegCuts; icut++) {
39353935
if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
39363936
isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
3937-
if (sign1 * sign2 < 0) { // +- pairs
3937+
if (sign1 * sign2 < 0) { // +- pairs
39383938
fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), dqefficiency_helpers::varValues()); // reconstructed, unmatched
39393939
if (isAmbi && fConfigQA) {
39403940
fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), dqefficiency_helpers::varValues());

PWGDQ/Tasks/tableReader_withAssoc.cxx renamed to PWGDQ/Tasks/tableReader_withAssoc.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
//
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
14+
// Precompiled into TableReaderWithAssocPCH
1415

15-
// Included verbatim by the *_workflowSpec.cxx variants and precompiled into
16-
// TableReaderWithAssocPCH; without the guard the two collide.
17-
#pragma once
16+
#ifndef PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_
17+
#define PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_
1818

1919
#include "PWGDQ/Core/AnalysisCompositeCut.h"
2020
#include "PWGDQ/Core/AnalysisCut.h"
@@ -5036,3 +5036,5 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
50365036
}
50375037
} // end loop over histogram classes
50385038
}
5039+
5040+
#endif // PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_

‎PWGDQ/Tasks/tableReader_withAssoc_AsymmetricPairing_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_DileptonTrackPairing_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_DileptonTrackTrackPairing_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_SameEventPairingBarrelOnly_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_SameEventPairingMuonOnly_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_SameEventPairing_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

‎PWGDQ/Tasks/tableReader_withAssoc_workflowSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
// Configurable workflow for running several DQ or other PWG analyses
1414

15-
#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
15+
#include "PWGDQ/Tasks/tableReader_withAssoc.h"
1616

1717
#include <Framework/AnalysisTask.h>
1818
#include <Framework/runDataProcessing.h>

0 commit comments

Comments
 (0)