Merge branch 'master' into fixes-Common

Author: vkucera

Common/DataModel/Multiplicity.h

@@ -285,6 +285,9 @@ DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //!
                   bc::Flags);
 using MultBC = MultBCs::iterator;
 
+DECLARE_SOA_TABLE(MultBcSel, "AOD", "MULTBCSEL", //! BC selection bits joinable with multBCs
+                  evsel::Selection);
+
 // crosslinks
 namespace mult
 {

Common/TableProducer/multiplicityExtraTable.cxx

@@ -41,6 +41,7 @@ const int nBCsPerOrbit = o2::constants::lhc::LHCMaxBunches;
 
 struct MultiplicityExtraTable {
   Produces<aod::MultBCs> multBC;
+  Produces<aod::MultBcSel> multBcSel;
   Produces<aod::MultNeighs> multNeigh;
 
   Produces<aod::Mults2BC> mult2bc;
@@ -85,7 +86,7 @@ struct MultiplicityExtraTable {
 
   using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Timestamps, aod::Run3MatchedToBCSparse>;
 
-  void processBCs(soa::Join<BCsWithRun3Matchings, aod::BCFlags> const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, soa::Join<aod::Collisions, aod::EvSels> const& collisions)
+  void processBCs(soa::Join<BCsWithRun3Matchings, aod::BCFlags, aod::BcSels> const& bcs, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&, soa::Join<aod::Collisions, aod::EvSels> const& collisions)
   {
     //+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+-<*>-+
     // determine saved BCs and corresponding new BC table index
@@ -260,6 +261,8 @@ struct MultiplicityExtraTable {
         multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC,
         bc.timestamp(),
         bc.flags());
+
+      multBcSel(bc.selection_raw());
     }
   }
 

Common/Tasks/centralityStudy.cxx

@@ -96,6 +96,7 @@ struct centralityStudy {
   Configurable<bool> rejectITSinROFpileupStandard{"rejectITSinROFpileupStandard", false, "reject collisions in case of in-ROF ITS pileup (standard)"};
   Configurable<bool> rejectITSinROFpileupStrict{"rejectITSinROFpileupStrict", false, "reject collisions in case of in-ROF ITS pileup (strict)"};
   Configurable<bool> rejectCollInTimeRangeNarrow{"rejectCollInTimeRangeNarrow", false, "reject if extra colls in time range (narrow)"};
+  Configurable<bool> rejectZNAC{"rejectZNAC", false, "reject if !(kIsBBZNA && kIsBBZNC)"};
 
   Configurable<bool> selectUPCcollisions{"selectUPCcollisions", false, "select collisions tagged with UPC flag"};
 
@@ -224,6 +225,13 @@ struct centralityStudy {
 
     if (doprocessBCs) {
       histos.add("hBCSelection", "hBCSelection", kTH1D, {{20, -0.5, 19.5f}});
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(1, "All BCs");
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(2, "Colliding BCs");
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(3, "TVX");
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(4, "FV0OrA");
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(5, "upc rej");
+      histos.get<TH1>(HIST("hBCSelection"))->GetXaxis()->SetBinLabel(6, "zdc rej");
+
       histos.add("hFT0C_BCs", "hFT0C_BCs", kTH1D, {axisMultUltraFineFT0C});
       histos.add("hFT0M_BCs", "hFT0M_BCs", kTH1D, {axisMultUltraFineFT0M});
       histos.add("hFV0A_BCs", "hFV0A_BCs", kTH1D, {axisMultUltraFineFV0A});
@@ -830,27 +838,31 @@ struct centralityStudy {
     genericProcessCollision(collision);
   }
 
-  void processBCs(soa::Join<aod::BC2Mults, aod::MultBCs>::iterator const& multbc, soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal> const&)
+  void processBCs(soa::Join<aod::BC2Mults, aod::MultBCs, aod::MultBcSel>::iterator const& multbc, soa::Join<aod::MultsRun3, aod::MFTMults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal> const&)
   {
     // process BCs, calculate FT0C distribution
     // conditionals suggested by FIT team (Jacek O. et al)
     histos.fill(HIST("hBCSelection"), 0); // all BCs
+
     if (selectCollidingBCs && !multbc.multCollidingBC())
       return;
     histos.fill(HIST("hBCSelection"), 1); // colliding
+
     if (selectTVX && !multbc.multTVX())
       return;
     histos.fill(HIST("hBCSelection"), 2); // TVX
+
     if (selectFV0OrA && !multbc.multFV0OrA())
       return;
     histos.fill(HIST("hBCSelection"), 3); // FV0OrA
+
     if (vertexZwithT0 < 100.0f) {
       if (!multbc.multFT0PosZValid())
         return;
       if (TMath::Abs(multbc.multFT0PosZ()) > vertexZwithT0)
         return;
     }
-    histos.fill(HIST("hBCSelection"), 4); // FV0OrA
+    histos.fill(HIST("hBCSelection"), 4); // FT0PosZ
 
     if (multbc.multFT0C() < upcRejection.maxFT0CforZNACselection &&
         multbc.multZNA() < upcRejection.minZNACsignal &&
@@ -865,8 +877,11 @@ struct centralityStudy {
         multbc.multFDDA() < upcRejection.minFDDAsignal) {
       return;
     }
-
-    histos.fill(HIST("hBCSelection"), 5); // znac
+    histos.fill(HIST("hBCSelection"), 5); // znac amp
+    if (rejectZNAC && !multbc.selection_bit(o2::aod::evsel::kIsBBZNA) && !multbc.selection_bit(o2::aod::evsel::kIsBBZNC)) {
+      return;
+    }
+    histos.fill(HIST("hBCSelection"), 6); // znac time
 
     // if we got here, we also finally fill the FT0C histogram, please
     histos.fill(HIST("hFT0C_BCs"), multbc.multFT0C() * scaleSignalFT0C);

Common/Tools/EventSelectionModule.h

@@ -27,6 +27,7 @@
 #include <DataFormatsCTP/Configuration.h>
 #include <DataFormatsCTP/Scalers.h>
 #include <DataFormatsFT0/Digit.h>
+#include <DataFormatsITSMFT/DPLAlpideParam.h>
 #include <DataFormatsITSMFT/TimeDeadMap.h>
 #include <DataFormatsParameters/AggregatedRunInfo.h>
 #include <DataFormatsParameters/GRPLHCIFData.h>
@@ -35,7 +36,6 @@
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
 #include <Framework/Logger.h>
-#include <ITSMFTBase/DPLAlpideParam.h>
 #include <ITSMFTReconstruction/ChipMappingITS.h>
 
 #include <TH1.h>

DPG/Tasks/AOTEvent/eventSelectionQa.cxx

@@ -22,6 +22,7 @@
 #include <CommonConstants/LHCConstants.h>
 #include <CommonDataFormat/BunchFilling.h>
 #include <CommonDataFormat/TimeStamp.h>
+#include <DataFormatsITSMFT/DPLAlpideParam.h>
 #include <DataFormatsITSMFT/TimeDeadMap.h>
 #include <DataFormatsParameters/AggregatedRunInfo.h>
 #include <DataFormatsParameters/GRPLHCIFData.h>
@@ -35,7 +36,6 @@
 #include <Framework/InitContext.h>
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
-#include <ITSMFTBase/DPLAlpideParam.h>
 #include <ITSMFTReconstruction/ChipMappingITS.h>
 #include <ReconstructionDataFormats/Vertex.h>
 

DPG/Tasks/AOTEvent/rofOccupancyQa.cxx

@@ -19,6 +19,7 @@
 
 #include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/LHCConstants.h>
+#include <DataFormatsITSMFT/DPLAlpideParam.h>
 #include <DataFormatsParameters/AggregatedRunInfo.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -30,7 +31,6 @@
 #include <Framework/InitContext.h>
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
-#include <ITSMFTBase/DPLAlpideParam.h>
 
 #include <cmath>
 #include <cstdint>