Merge branch 'AliceO2Group:master' into new-derivedLongrange

Author: abmodak

Common/DataModel/ZDCLightIons.h

@@ -13,8 +13,8 @@
 /// \brief ZDC data model for O-O Ne-Ne and p-O collisions
 /// \author Chiara Oppedisano <chiara.oppedisano@cern.ch>
 
-#ifndef PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
-#define PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
+#ifndef COMMON_DATAMODEL_ZDCLIGHTIONS_H_
+#define COMMON_DATAMODEL_ZDCLIGHTIONS_H_
 
 #include "Common/DataModel/Centrality.h"
 
@@ -77,8 +77,10 @@ DECLARE_SOA_TABLE(ZDCLightIons, "AOD", "ZDCTABLELIGHTIONS",
                   zdclightions::ZncPm4,
                   zdclightions::ZpaTdc,
                   zdclightions::ZpaAmpl,
+                  zdclightions::ZpaPmc,
                   zdclightions::ZpcTdc,
                   zdclightions::ZpcAmpl,
+                  zdclightions::ZpcPmc,
                   zdclightions::Zem1Tdc,
                   zdclightions::Zem1Ampl,
                   zdclightions::Zem2Tdc,

Common/TableProducer/zdcTaskLightIons.cxx

@@ -173,6 +173,8 @@ struct ZdcTaskLightIons {
         //
         double pmcZNA = bc.zdc().energyCommonZNA();
         double pmcZNC = bc.zdc().energyCommonZNC();
+        double pmcZPA = bc.zdc().energyCommonZPA();
+        double pmcZPC = bc.zdc().energyCommonZPC();
         double pmqZNC[4] = {
           0,
           0,
@@ -213,7 +215,9 @@ struct ZdcTaskLightIons {
 
         zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
                    tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
-                   tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
+                   tdcZPA, zpa, pmcZPA,
+                   tdcZPC, zpc, pmcZPC,
+                   tdcZEM1, zem1, tdcZEM2, zem2,
                    -1, -1, -1,
                    -1.,
                    -1, -1, -1,
@@ -226,7 +230,7 @@ struct ZdcTaskLightIons {
   /// note that it has to be declared after the function, so that the pointer is known
   PROCESS_SWITCH(ZdcTaskLightIons, processZDCBC, "Processing ZDC 4 auto-triggered events", true);
 
-  void processALICEcoll(ColEvSels const& cols, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcs*/)
+  void processALICEcoll(ColEvSels const& cols, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcs*/, aod::FT0s const& /*ft0s*/, aod::FV0As const& /*fv0*/)
   {
     // collision-based event selection
     for (auto const& collision : cols) {
@@ -276,6 +280,8 @@ struct ZdcTaskLightIons {
         //
         double pmcZNA = zdc.energyCommonZNA();
         double pmcZNC = zdc.energyCommonZNC();
+        double pmcZPA = zdc.energyCommonZPA();
+        double pmcZPC = zdc.energyCommonZPC();
         double pmqZNC[4] = {
           0,
           0,
@@ -316,7 +322,9 @@ struct ZdcTaskLightIons {
 
         zdcTableLI(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
                    tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
-                   tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
+                   tdcZPA, zpa, pmcZPA,
+                   tdcZPC, zpc, pmcZPC,
+                   tdcZEM1, zem1, tdcZEM2, zem2,
                    multFT0A, multFT0C, multV0A,
                    zv,
                    centralityFT0C, centralityFT0A, centralityFT0M,

DPG/Tasks/AOTEvent/eventSelectionQa.cxx

@@ -70,6 +70,7 @@ struct EventSelectionQaTask {
   Configurable<int32_t> nGlobalBCs{"nGlobalBCs", 100000, "number of global bcs for detailed monitoring"};
   Configurable<bool> isLowFlux{"isLowFlux", 1, "1 - low flux (pp, pPb), 0 - high flux (PbPb)"};
   Configurable<bool> fillITSdeadStaveHists{"fillITSdeadStaveHists", 0, "0 - no, 1 - yes"};
+  Configurable<bool> fillTPCnClsVsOccupancyHists{"fillTPCnClsVsOccupancyHists", 0, "0 - no, 1 - yes"};
 
   Service<o2::ccdb::BasicCCDBManager> ccdb;
   HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
@@ -375,18 +376,24 @@ struct EventSelectionQaTask {
       histos.add("occupancyQA/hNumTracksITSTPC_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_NarrowDeltaTimeCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPV, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_NarrowDeltaTimeCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_StandardDeltaTimeCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPV, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_StandardDeltaTimeCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_GoodITSLayersAllCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPV, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_GoodITSLayersAllCut", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
       // requested by TPC experts: nTPConly tracks vs occupancy
       histos.add("occupancyQA/hNumTracksTPConly_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
       histos.add("occupancyQA/hNumTracksTPConlyNoITS_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
       // request from experts to add track properties vs occupancy, to compare data vs MC
-      const AxisSpec axisOccupancyForTrackQA{60, 0., 15000, "occupancy (n ITS tracks weighted)"};
-      const AxisSpec axisNTPCcls{150, 0, 150, "n TPC clusters"};
-      histos.add("occupancyQA/tpcNClsFound_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
-      histos.add("occupancyQA/tpcNClsFindable_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
-      histos.add("occupancyQA/tpcNClsShared_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
-      histos.add("occupancyQA/tpcNCrossedRows_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
-      const AxisSpec axisChi2TPC{150, 0, 15, "chi2Ncl TPC"};
-      histos.add("occupancyQA/tpcChi2_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisChi2TPC, axisOccupancyForTrackQA});
+      if (fillTPCnClsVsOccupancyHists) {
+        const AxisSpec axisOccupancyForTrackQA{60, 0., 15000, "occupancy (n ITS tracks weighted)"};
+        const AxisSpec axisNTPCcls{150, 0, 150, "n TPC clusters"};
+        histos.add("occupancyQA/tpcNClsFound_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
+        histos.add("occupancyQA/tpcNClsFindable_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
+        histos.add("occupancyQA/tpcNClsShared_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
+        histos.add("occupancyQA/tpcNCrossedRows_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNTPCcls, axisOccupancyForTrackQA});
+        const AxisSpec axisChi2TPC{150, 0, 15, "chi2Ncl TPC"};
+        histos.add("occupancyQA/tpcChi2_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisChi2TPC, axisOccupancyForTrackQA});
+      }
 
       // ITS in-ROF occupancy
       histos.add("occupancyQA/hITSTracks_ev1_vs_ev2_2coll_in_ROF", ";nITStracks event #1;nITStracks event #2", kTH2D, {{200, 0., 6000}, {200, 0., 6000}});
@@ -1198,7 +1205,7 @@ struct EventSelectionQaTask {
           if (track.hasTPC()) {
             nContributorsAfterEtaTPCLooseCuts++;
 
-            if (!isLowFlux && col.sel8() && col.selection_bit(kNoSameBunchPileup) && fabs(col.posZ()) < 10 && occupancyByTracks >= 0) {
+            if (!isLowFlux && fillTPCnClsVsOccupancyHists && col.sel8() && col.selection_bit(kNoSameBunchPileup) && fabs(col.posZ()) < 10 && occupancyByTracks >= 0) {
               histos.fill(HIST("occupancyQA/tpcNClsFound_vs_V0A_vs_occupancy"), multV0A, track.tpcNClsFound(), occupancyByTracks);
               histos.fill(HIST("occupancyQA/tpcNClsFindable_vs_V0A_vs_occupancy"), multV0A, track.tpcNClsFindable(), occupancyByTracks);
               histos.fill(HIST("occupancyQA/tpcNClsShared_vs_V0A_vs_occupancy"), multV0A, track.tpcNClsShared(), occupancyByTracks);
@@ -1248,6 +1255,14 @@ struct EventSelectionQaTask {
             histos.fill(HIST("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_NarrowDeltaTimeCut"), multV0A, nPV, occupancyByTracks);
             histos.fill(HIST("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_NarrowDeltaTimeCut"), multV0A, nContributorsAfterEtaTPCCuts, occupancyByTracks);
           }
+          if (col.selection_bit(kNoCollInTimeRangeStandard)) {
+            histos.fill(HIST("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_StandardDeltaTimeCut"), multV0A, nPV, occupancyByTracks);
+            histos.fill(HIST("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_StandardDeltaTimeCut"), multV0A, nContributorsAfterEtaTPCCuts, occupancyByTracks);
+          }
+          if (col.selection_bit(kIsGoodITSLayersAll)) {
+            histos.fill(HIST("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy_GoodITSLayersAllCut"), multV0A, nPV, occupancyByTracks);
+            histos.fill(HIST("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy_GoodITSLayersAllCut"), multV0A, nContributorsAfterEtaTPCCuts, occupancyByTracks);
+          }
           histos.fill(HIST("occupancyQA/hNumTracksTPConly_vs_V0A_vs_occupancy"), multV0A, nTPConly, occupancyByTracks);
           histos.fill(HIST("occupancyQA/hNumTracksTPConlyNoITS_vs_V0A_vs_occupancy"), multV0A, nTPConlyNoITS, occupancyByTracks);
 

DPG/Tasks/AOTEvent/timeDependentQa.cxx

@@ -69,6 +69,7 @@ struct TimeDependentQaTask {
   Configurable<float> confTimeBinWidthInSec{"TimeBinWidthInSec", 0.5, "Width of time bins in seconds"};                                                                          // o2-linter: disable=name/configurable (temporary fix)
   Configurable<float> confTimeWiderBinFactor{"TimeWideBinFactor", 4, "Factor for wider time bins for some 2D histograms"};                                                       // o2-linter: disable=name/configurable (temporary fix)
   Configurable<float> confTimeMuchWiderBinFactor{"TimeMuchWiderBinFactor", 20, "Factor for even wider time bins for some 2D histograms"};                                        // o2-linter: disable=name/configurable (temporary fix)
+  Configurable<float> confTimeMuchMuchWiderBinFactor{"TimeMuchMuchWiderBinFactor", 120, "Factor for super wide time bins for some 2D histograms"};                               // o2-linter: disable=name/configurable (temporary fix)
   Configurable<int> confTakeVerticesWithUPCsettings{"ConsiderVerticesWithUPCsettings", 0, "Take vertices: 0 - all , 1 - only without UPC settings, 2 - only with UPC settings"}; // o2-linter: disable=name/configurable (temporary fix)
   Configurable<int> confFlagFillPhiVsTimeHist{"FlagFillPhiVsTimeHist", 2, "0 - don't fill , 1 - fill only for global/7cls/TRD/TOF tracks, 2 - fill also layer-by-layer"};        // o2-linter: disable=name/configurable (temporary fix)
   Configurable<int> confFlagFillEtaPhiVsTimeHist{"FlagFillEtaPhiVsTimeHist", 0, "0 - don't fill , 1 - fill"};                                                                    // o2-linter: disable=name/configurable (temporary fix)
@@ -205,11 +206,14 @@ struct TimeDependentQaTask {
       int nTimeBins = static_cast<int>((maxSec - minSec) / confTimeBinWidthInSec);
       int nTimeWideBins = static_cast<int>((maxSec - minSec) / confTimeBinWidthInSec / confTimeWiderBinFactor);
       int nTimeVeryWideBins = static_cast<int>((maxSec - minSec) / confTimeBinWidthInSec / confTimeMuchWiderBinFactor);
+      int nTimeSuperWideBins = static_cast<int>((maxSec - minSec) / confTimeBinWidthInSec / confTimeMuchMuchWiderBinFactor);
       double timeInterval = nTimeBins * confTimeBinWidthInSec;
 
       const AxisSpec axisSeconds{nTimeBins, 0, timeInterval, "seconds"};
       const AxisSpec axisSecondsWideBins{nTimeWideBins, 0, timeInterval, "seconds"};
       const AxisSpec axisSecondsVeryWideBins{nTimeVeryWideBins, 0, timeInterval, "seconds"};
+      const AxisSpec axisSecondsSuperWideBins{nTimeSuperWideBins, 0, timeInterval, "seconds"};
+
       histos.add("hSecondsBCsTVX", "", kTH1D, {axisSeconds});
       histos.add("hSecondsBCsTVXandTFborderCuts", "", kTH1D, {axisSeconds});
 
@@ -234,6 +238,10 @@ struct TimeDependentQaTask {
       histos.add("hSecondsUPCverticesBeforeSel8", "", kTH2F, {axisSeconds, {2, -0.5, 1.5, "Is vertex with UPC settings after |vZ|<10 cut"}});
       histos.add("hSecondsUPCvertices", "", kTH2F, {axisSeconds, {2, -0.5, 1.5, "Is vertex with UPC settings after |vZ|<10 and sel8 cuts"}});
 
+      const int32_t nBCsPerOrbit = o2::constants::lhc::LHCMaxBunches;
+      const AxisSpec axisBCs{nBCsPerOrbit, 0., static_cast<double>(nBCsPerOrbit), ""};
+      histos.add("hSecondsBCsMap", "", kTH2F, {axisSecondsSuperWideBins, axisBCs});
+
       // shapes of distributions (added for the O-O run monitoring)
       if (confIncludeMultDistrVsTimeHistos) {
         int maxNtracks = confMaxNtracksForTimeDepDistributions;
@@ -469,6 +477,11 @@ struct TimeDependentQaTask {
       double secFromSOR = ts / 1000. - minSec;
       if (bc.selection_bit(kIsTriggerTVX)) {
         histos.fill(HIST("hSecondsBCsTVX"), secFromSOR);
+
+        uint64_t globalBC = bc.globalBC();
+        int localBC = globalBC % nBCsPerOrbit;
+        histos.fill(HIST("hSecondsBCsMap"), secFromSOR, localBC);
+
         if (bc.selection_bit(kNoTimeFrameBorder)) {
           histos.fill(HIST("hSecondsBCsTVXandTFborderCuts"), secFromSOR);
         }
@@ -568,7 +581,7 @@ struct TimeDependentQaTask {
       histos.fill(HIST("hSecondsEventSelBits"), secFromSOR, enIsLowOccupStdAlsoInPrevRofCut2000noDeadStaves, isLowOccupStdAlsoInPrevRofCut2000noDeadStaves);
 
       // check RCT flags
-      histos.fill(HIST("hSecondsRCTflags"), secFromSOR, 0); // n collisions sel8
+      histos.fill(HIST("hSecondsRCTflags"), secFromSOR, 0);                                 // n collisions sel8
       histos.fill(HIST("hSecondsRCTflags"), secFromSOR, 1, col.rct_bit(kCcdbObjectLoaded)); // CCDB object not loaded
       LOGP(debug, "i = 1, bitValue = {}, binLabel={}, binCenter={}", col.rct_bit(kCcdbObjectLoaded), axRctFlags->GetBinLabel(2), axRctFlags->GetBinCenter(2));
       for (int iFlag = 0; iFlag < kNRCTSelectionFlags; iFlag++) {

PWGCF/DataModel/SPTableZDC.h

@@ -14,44 +14,42 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include <cmath>
-
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisDataModel.h"
 
+#include <cmath>
+#include <vector>
+
 namespace o2::aod
 {
 namespace sptablezdc
 {
 DECLARE_SOA_COLUMN(Runnumber, runnumber, int);
-DECLARE_SOA_COLUMN(Cent, cent, float);
-DECLARE_SOA_COLUMN(Vx, vx, float);
-DECLARE_SOA_COLUMN(Vy, vy, float);
-DECLARE_SOA_COLUMN(Vz, vz, float);
-DECLARE_SOA_COLUMN(QXA, qxA, float);
-DECLARE_SOA_COLUMN(QYA, qyA, float);
-DECLARE_SOA_COLUMN(QXC, qxC, float);
-DECLARE_SOA_COLUMN(QYC, qyC, float);
+DECLARE_SOA_COLUMN(Cents, cents, std::vector<float>);
+DECLARE_SOA_COLUMN(Vertex, vertex, std::vector<float>);
+DECLARE_SOA_COLUMN(Timestamp, timestamp, int64_t);
+DECLARE_SOA_COLUMN(QxA, qxA, float);
+DECLARE_SOA_COLUMN(QyA, qyA, float);
+DECLARE_SOA_COLUMN(QxC, qxC, float);
+DECLARE_SOA_COLUMN(QyC, qyC, float);
 DECLARE_SOA_COLUMN(IsSelected, isSelected, bool);
-DECLARE_SOA_COLUMN(Iteration, iteration, int);
-DECLARE_SOA_COLUMN(Step, step, int);
+DECLARE_SOA_COLUMN(EventSelectionFlags, eventSelectionFlags, uint16_t);
 
 } // namespace sptablezdc
 
 DECLARE_SOA_TABLE(SPTableZDC, "AOD", "SPZDC",
                   sptablezdc::Runnumber,
-                  sptablezdc::Cent,
-                  sptablezdc::Vx,
-                  sptablezdc::Vy,
-                  sptablezdc::Vz,
-                  sptablezdc::QXA,
-                  sptablezdc::QYA,
-                  sptablezdc::QXC,
-                  sptablezdc::QYC,
+                  sptablezdc::Cents,
+                  sptablezdc::Vertex,
+                  sptablezdc::Timestamp,
+                  sptablezdc::QxA,
+                  sptablezdc::QyA,
+                  sptablezdc::QxC,
+                  sptablezdc::QyC,
                   sptablezdc::IsSelected,
-                  sptablezdc::Iteration,
-                  sptablezdc::Step);
+                  sptablezdc::EventSelectionFlags);
 } // namespace o2::aod
 #endif // PWGCF_DATAMODEL_SPTABLEZDC_H_