Merge branch 'AliceO2Group:master' into master

Author: mvolkl

CMakeLists.txt

@@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set_property(GLOBAL PROPERTY REPORT_UNDEFINED_PROPERTIES)
 
 cmake_host_system_information(RESULT _totalmem QUERY TOTAL_PHYSICAL_MEMORY)
-math(EXPR _total_analysis_jobs "(${_totalmem}-2048)/4096")
+math(EXPR _total_analysis_jobs "(${_totalmem}-2048)/2048")
 if(_total_analysis_jobs LESS_EQUAL 0)
   set(_total_analysis_jobs 1)
 endif()

Common/DataModel/Multiplicity.h

@@ -113,7 +113,7 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //!
                   mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
                   mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC,
                   mult::MultAllTracksTPCOnly, mult::MultAllTracksITSTPC,
-                  mult::BCNumber);
+                  mult::BCNumber, evsel::NumTracksInTimeRange);
 
 DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //!
                   mult::TimeToPrePrevious, mult::TimeToPrevious,

Common/TableProducer/multiplicityExtraTable.cxx

@@ -8,6 +8,8 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
+#include <CCDB/BasicCCDBManager.h> // megalinter thinks this is a C header...
+#include <bitset>
 #include "Framework/ConfigParamSpec.h"
 #include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
@@ -16,13 +18,10 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "DataFormatsFIT/Triggers.h"
 #include "TableHelper.h"
-
 #include "CCDB/CcdbApi.h"
 #include "CommonDataFormat/BunchFilling.h"
-#include <CCDB/BasicCCDBManager.h>
 #include "DataFormatsParameters/GRPObject.h"
 #include "DataFormatsParameters/GRPLHCIFData.h"
-#include <bitset>
 
 using namespace o2;
 using namespace o2::framework;
@@ -34,6 +33,12 @@ struct MultiplicityExtraTable {
   Produces<aod::MultsBC> multBC;
   Produces<aod::MultNeighs> multNeigh;
 
+  // Allow for downscaling of BC table for less space use in derived data
+  Configurable<float> bcDownscaleFactor{"bcDownscaleFactor", 2, "Downscale factor for BC table (0: save nothing, 1: save all)"};
+
+  // needed for downscale
+  unsigned int randomSeed = 0;
+
   o2::ccdb::CcdbApi ccdbApi;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
   BCPattern CollidingBunch;
@@ -43,6 +48,8 @@ struct MultiplicityExtraTable {
 
   void init(InitContext&)
   {
+    randomSeed = static_cast<unsigned int>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
+
     ccdbApi.init("http://alice-ccdb.cern.ch");
     ccdb->setURL("http://alice-ccdb.cern.ch");
     ccdb->setCaching(true);
@@ -53,6 +60,11 @@ struct MultiplicityExtraTable {
 
   void processBCs(BCsWithRun3Matchings::iterator const& bc, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&)
   {
+    // downscale if requested to do so
+    if (bcDownscaleFactor < 1.f && (static_cast<float>(rand_r(&randomSeed)) / static_cast<float>(RAND_MAX)) > bcDownscaleFactor) {
+      return;
+    }
+
     bool Tvx = false;
     bool isFV0OrA = false;
     float multFT0C = 0.f;

Common/TableProducer/multiplicityTable.cxx

@@ -507,7 +507,7 @@ struct MultiplicityTable {
             tableExtra(collision.numContrib(), collision.chi2(), collision.collisionTimeRes(),
                        mRunNumber, collision.posZ(), collision.sel8(),
                        nHasITS, nHasTPC, nHasTOF, nHasTRD, nITSonly, nTPConly, nITSTPC,
-                       nAllTracksTPCOnly, nAllTracksITSTPC, bcNumber);
+                       nAllTracksTPCOnly, nAllTracksITSTPC, bcNumber, collision.trackOccupancyInTimeRange());
           } break;
           case kMultSelections: // Multiplicity selections
           {

DPG/Tasks/AOTTrack/qaEfficiency.cxx

@@ -16,7 +16,7 @@ o2physics_add_dpl_workflow(flow-pt-efficiency
 
 o2physics_add_dpl_workflow(flow-pbpb-task
                     SOURCES FlowPbPbTask.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::GFWCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::GFWCore
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(flow-gfw-pbpb

PWGCF/Flow/Tasks/CMakeLists.txt

@@ -27,6 +27,7 @@
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/CCDB/ctpRateFetcher.h"
 
 #include "GFWPowerArray.h"
 #include "GFW.h"
@@ -56,6 +57,8 @@ struct FlowPbPbTask {
   O2_DEFINE_CONFIGURABLE(cfgCutTPCclu, float, 70.0f, "minimum TPC clusters")
   O2_DEFINE_CONFIGURABLE(cfgUseAdditionalEventCut, bool, false, "Use additional event cut on mult correlations")
   O2_DEFINE_CONFIGURABLE(cfgUseAdditionalTrackCut, bool, false, "Use additional track cut on phi")
+  O2_DEFINE_CONFIGURABLE(cfgUseInteractionRateCut, bool, false, "Use events with low interaction rate")
+  O2_DEFINE_CONFIGURABLE(cfgCutIR, float, 50.0, "maximum interaction rate (kHz)")
   O2_DEFINE_CONFIGURABLE(cfgUseNch, bool, false, "Use Nch for flow observables")
   O2_DEFINE_CONFIGURABLE(cfgNbootstrap, int, 10, "Number of subsamples")
   O2_DEFINE_CONFIGURABLE(cfgOutputNUAWeights, bool, false, "Fill and output NUA weights")
@@ -112,6 +115,12 @@ struct FlowPbPbTask {
     // Count the total number of enum
     kCount_ExtraProfile
   };
+  int mRunNumber{-1};
+  uint64_t mSOR{0};
+  double mMinSeconds{-1.};
+  std::unordered_map<int, TH2*> gHadronicRate;
+  ctpRateFetcher mRateFetcher;
+  TH2* gCurrentHadronicRate;
 
   using aodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>>;
   using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra, aod::TracksDCA>>;
@@ -517,6 +526,23 @@ struct FlowPbPbTask {
     return true;
   }
 
+  void initHadronicRate(aod::BCsWithTimestamps::iterator const& bc)
+  {
+    if (mRunNumber == bc.runNumber()) {
+      return;
+    }
+    mRunNumber = bc.runNumber();
+    if (gHadronicRate.find(mRunNumber) == gHadronicRate.end()) {
+      auto runDuration = ccdb->getRunDuration(mRunNumber);
+      mSOR = runDuration.first;
+      mMinSeconds = std::floor(mSOR * 1.e-3);                /// round tsSOR to the highest integer lower than tsSOR
+      double maxSec = std::ceil(runDuration.second * 1.e-3); /// round tsEOR to the lowest integer higher than tsEOR
+      const AxisSpec axisSeconds{static_cast<int>((maxSec - mMinSeconds) / 20.f), 0, maxSec - mMinSeconds, "Seconds since SOR"};
+      gHadronicRate[mRunNumber] = registry.add<TH2>(Form("HadronicRate/%i", mRunNumber), ";Time since SOR (s);Hadronic rate (kHz)", kTH2D, {axisSeconds, {510, 0., 51.}}).get();
+    }
+    gCurrentHadronicRate = gHadronicRate[mRunNumber];
+  }
+
   void process(aodCollisions::iterator const& collision, aod::BCsWithTimestamps const&, aodTracks const& tracks)
   {
     registry.fill(HIST("hEventCount"), 0.5);
@@ -545,6 +571,12 @@ struct FlowPbPbTask {
     registry.fill(HIST("hCent"), collision.centFT0C());
     fGFW->Clear();
     auto bc = collision.bc_as<aod::BCsWithTimestamps>();
+    initHadronicRate(bc);
+    double hadronicRate = mRateFetcher.fetch(ccdb.service, bc.timestamp(), mRunNumber, "ZNC hadronic") * 1.e-3; //
+    double seconds = bc.timestamp() * 1.e-3 - mMinSeconds;
+    if (cfgUseInteractionRateCut && hadronicRate > cfgCutIR) // cut on hadronic rate
+      return;
+    gCurrentHadronicRate->Fill(seconds, hadronicRate);
     loadCorrections(bc.timestamp());
     registry.fill(HIST("hEventCount"), 4.5);
 

PWGCF/Flow/Tasks/FlowPbPbTask.cxx

@@ -64,8 +64,6 @@ class JFFlucAnalysis : public TNamed
     HIST_THN_PHIETAZ,
     HIST_THN_PTETA,
     HIST_THN_PHIETA,
-    // HIST_THN_VN,
-    // HIST_THN_VN_VN,
     HIST_THN_SC_with_QC_4corr,
     HIST_THN_SC_with_QC_2corr,
     HIST_THN_SC_with_QC_2corr_gap,
@@ -152,14 +150,9 @@ class JFFlucAnalysis : public TNamed
       if constexpr (std::experimental::is_detected<hasWeightNUA, const JInputClassIter>::value)
         corrInv /= track.weightNUA();
       pht[HIST_THN_PHIETA]->Fill(fCent, track.phi(), track.eta(), corrInv);
-
-      // if (TMath::Abs(track.eta()) < fEta_min || TMath::Abs(track.eta()) > fEta_max)
-      //   continue;
       pht[HIST_THN_PHIETAZ]->Fill(fCent, track.phi(), track.eta(), fVertex[2], corrInv);
     }
 
-    // for (UInt_t iaxis = 0; iaxis < 3; iaxis++)
-    // fh_vertex[iaxis]->Fill(fVertex[iaxis]);
     ph1[HIST_TH1_ZVERTEX]->Fill(fVertex[2]);
   }
 

PWGCF/JCorran/Core/JFFlucAnalysis.h

@@ -42,6 +42,14 @@ DECLARE_SOA_TABLE(JTracks, "AOD", "JTRACK", //! Reduced track table
                   jtrack::JCollisionId,
                   jtrack::Pt, jtrack::Eta, jtrack::Phi, jtrack::Sign);
 using JTrack = JTracks::iterator;
+
+namespace jweight
+{
+DECLARE_SOA_COLUMN(WeightNUA, weightNUA, float); //! Non-uniform acceptance weight
+DECLARE_SOA_COLUMN(WeightEff, weightEff, float); //! Non-uniform efficiency weight
+} // namespace jweight
+DECLARE_SOA_TABLE(JWeights, "AOD", "JWEIGHT", jweight::WeightNUA, jweight::WeightEff); //! JFluc table for weights
+
 } // namespace o2::aod
 
 #endif // PWGCF_JCORRAN_DATAMODEL_JCATALYST_H_

PWGCF/JCorran/DataModel/JCatalyst.h

@@ -14,6 +14,11 @@ o2physics_add_dpl_workflow(jfluc-analysis
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::JCorran
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(jfluc-weights-loader
+                    SOURCES jflucWeightsLoader.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::JCorran
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(flow-spc
                     SOURCES flowJSPCAnalysis.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::JCorran
@@ -22,4 +27,4 @@ o2physics_add_dpl_workflow(flow-spc
 o2physics_add_dpl_workflow(flow-nuacreation
                     SOURCES flowJNUACreation.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::JCorran
-                    COMPONENT_NAME Analysis)
+                    COMPONENT_NAME Analysis)