Common: changes to multiplicity study variables

AliceO2Group · Oct 26, 2024 · 9ba40c9 · 9ba40c9
1 parent ae8d505
commit 9ba40c9
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 2 deletions.
diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h
@@ -110,14 +110,25 @@ using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
 using FT0Mult = FT0Mults::iterator;
 using Mult = Mults::iterator;
 
-DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //!
+DECLARE_SOA_TABLE(MultsExtra_000, "AOD", "MULTEXTRA", //!
                   mult::MultPVTotalContributors, mult::MultPVChi2, mult::MultCollisionTimeRes, mult::MultRunNumber, mult::MultPVz, mult::MultSel8,
                   mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
                   mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC,
                   mult::MultAllTracksTPCOnly, mult::MultAllTracksITSTPC,
                   evsel::NumTracksInTimeRange,
                   collision::Flags);
 
+DECLARE_SOA_TABLE_VERSIONED(MultsExtra_001, "AOD", "MULTEXTRA", 1,     //! debug information
+                  mult::MultPVTotalContributors, mult::MultPVChi2, mult::MultCollisionTimeRes, mult::MultRunNumber, mult::MultPVz, mult::MultSel8,
+                  mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
+                  mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC,
+                  mult::MultAllTracksTPCOnly, mult::MultAllTracksITSTPC,
+                  evsel::NumTracksInTimeRange,
+                  evsel::SumAmpFT0CInTimeRange,
+                  collision::Flags);
+
+using MultsExtra = MultsExtra_001;
+
 DECLARE_SOA_TABLE(MultNeighs, "AOD", "MULTNEIGH", //!
                   mult::TimeToPrePrevious, mult::TimeToPrevious,
                   mult::TimeToNext, mult::TimeToNeNext);

diff --git a/Common/TableProducer/Converters/CMakeLists.txt b/Common/TableProducer/Converters/CMakeLists.txt
@@ -69,3 +69,8 @@ o2physics_add_dpl_workflow(hmpid-converter
                     PUBLIC_LINK_LIBRARIES
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(multsextra-converter
+                    SOURCES multsExtraConverter.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
diff --git a/Common/TableProducer/Converters/multsExtraConverter.cxx b/Common/TableProducer/Converters/multsExtraConverter.cxx
@@ -0,0 +1,43 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// 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 "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Common/DataModel/Multiplicity.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+struct MultsExtraConverter {
+  Produces<aod::MultsExtra_001> multsExtra_001;
+  void process(aod::MultsExtra_000 const& multsExtra_000)
+  {
+    for (const auto& r : multsExtra_000) {
+      multsExtra_001(r.multPVTotalContributors(), r.multPVChi2(),               
+                     r.multCollisionTimeRes(), r.multRunNumber(), r.multPVz(), r.multSel8(),
+                     r.multNTracksHasITS(), r.multNTracksHasTPC(), r.multNTracksHasTOF(), 
+                     r.multNTracksHasTRD(), r.multNTracksITSOnly(), 
+                     r.multNTracksTPCOnly(), r.multNTracksITSTPC(),
+                     r.multAllTracksTPCOnly(), r.multAllTracksITSTPC(),
+                     r.trackOccupancyInTimeRange(),
+                     0.0f,
+                     r.flags());
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<MultsExtraConverter>(cfgc)
+  };
+}
diff --git a/Common/TableProducer/multiplicityTable.cxx b/Common/TableProducer/multiplicityTable.cxx
@@ -568,7 +568,10 @@ struct MultiplicityTable {
             tableExtra(collision.numContrib(), collision.chi2(), collision.collisionTimeRes(),
                        mRunNumber, collision.posZ(), collision.sel8(),
                        nHasITS, nHasTPC, nHasTOF, nHasTRD, nITSonly, nTPConly, nITSTPC,
-                       nAllTracksTPCOnly, nAllTracksITSTPC, collision.trackOccupancyInTimeRange(), collision.flags());
+                       nAllTracksTPCOnly, nAllTracksITSTPC, 
+                       collision.trackOccupancyInTimeRange(), 
+                       collision.ft0cOccupancyInTimeRange(),
+                       collision.flags());
           } break;
           case kMultSelections: // Multiplicity selections
           {