Fix DQ PCH

Author: vkucera

PWGDQ/Tasks/CMakeLists.txt

@@ -9,7 +9,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-# tableReader_withAssoc.cxx is 5000 lines of task definitions, and seven
+# tableReader_withAssoc.h is 5000 lines of task definitions, and seven
 # workflow variants below #include it verbatim -- differing only in which
 # adaptAnalysisTask<> entries they list, with identical preprocessor state and
 # identical link libraries. Without this it is parsed and instantiated seven
@@ -21,7 +21,7 @@ add_library(TableReaderWithAssocPCH OBJECT tableReaderWithAssocPCH.cxx)
 target_link_libraries(TableReaderWithAssocPCH PUBLIC O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::MLCore)
 if(NOT DEFINED ENV{USE_RECC})
   target_precompile_headers(TableReaderWithAssocPCH PRIVATE
-    [["PWGDQ/Tasks/tableReader_withAssoc.cxx"]])
+    [["PWGDQ/Tasks/tableReader_withAssoc.h"]])
 endif()
 
 o2physics_add_dpl_workflow(table-reader

PWGDQ/Tasks/dqEfficiency_withAssoc.cxx

@@ -2482,9 +2482,9 @@ struct AnalysisSameEventPairing {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbiInBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 28)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 29));
             isAmbiOutOfBunch = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                    // +- pairs
+            if (sign1 * sign2 < 0) {                                                                 // +- pairs
               fHistMan->FillHistClass(histNames[icut][0].Data(), dqefficiency_helpers::varValues()); // reconstructed, unmatched
-              for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {        // loop over MC signals
+              for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {                     // loop over MC signals
                 if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
                   PromptNonPromptSepTable(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kRap], VarManager::fgValues[VarManager::kPhi],
                                           VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMass], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMassRecalculatePV],
@@ -2737,7 +2737,7 @@ struct AnalysisSameEventPairing {
     //   cout << "AnalysisSameEventPairing::runMCGen() completed" << endl;
   }
 
-  // Run same-event e-mu pairing on reconstructed tracks. Logic mirrors runEmuSameEventPairing in tableReader_withAssoc.cxx
+  // Run same-event e-mu pairing on reconstructed tracks. Logic mirrors runEmuSameEventPairing in tableReader_withAssoc.h
   // with MC matching added: for each pair we evaluate the user-supplied fEmuRecMCSignals (2-prong, leg1=e, leg2=µ)
   // and fill an MC-matched histogram per (track cut, muon cut, signal) when CheckSignal returns true on the linked
   // ReducedMCTracks. Mixed events are handled in runEmuMixedPairing / runEmuSameSideMixing and do not perform MC matching.
@@ -3934,7 +3934,7 @@ struct AnalysisAsymmetricPairing {
         for (int icut = 0; icut < fNLegCuts; icut++) {
           if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
             isAmbi = (twoTrackFilter & (static_cast<uint32_t>(1) << 30)) || (twoTrackFilter & (static_cast<uint32_t>(1) << 31));
-            if (sign1 * sign2 < 0) {                                                                                // +- pairs
+            if (sign1 * sign2 < 0) {                                                                                             // +- pairs
               fHistMan->FillHistClass(Form("PairsBarrelSEPM_%s", fLegCutNames[icut].Data()), dqefficiency_helpers::varValues()); // reconstructed, unmatched
               if (isAmbi && fConfigQA) {
                 fHistMan->FillHistClass(Form("PairsBarrelSEPM_ambiguous_%s", fLegCutNames[icut].Data()), dqefficiency_helpers::varValues());

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

@@ -14,7 +14,9 @@
 
 // Included verbatim by the *_workflowSpec.cxx variants and precompiled into
 // TableReaderWithAssocPCH; without the guard the two collide.
-#pragma once
+
+#ifndef PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_
+#define PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_
 
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
 #include "PWGDQ/Core/AnalysisCut.h"
@@ -5036,3 +5038,5 @@ void DefineHistograms(HistogramManager* histMan, const TString& histClasses, con
     }
   } // end loop over histogram classes
 }
+
+#endif // PWGDQ_TASKS_TABLEREADER_WITHASSOC_H_

PWGDQ/Tasks/tableReader_withAssoc_AsymmetricPairing_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_DileptonTrackPairing_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_DileptonTrackTrackPairing_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_SameEventPairingBarrelOnly_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_SameEventPairingMuonOnly_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_SameEventPairing_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>

PWGDQ/Tasks/tableReader_withAssoc_workflowSpec.cxx

@@ -12,7 +12,7 @@
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //   Configurable workflow for running several DQ or other PWG analyses
 
-#include "PWGDQ/Tasks/tableReader_withAssoc.cxx"
+#include "PWGDQ/Tasks/tableReader_withAssoc.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>