Converter implemented for FITbit tables version 000 to 001; bug fix in the new FITbit table

Author: sandor-lokos

PWGUD/DataModel/UDTables.h

@@ -436,7 +436,7 @@ DECLARE_SOA_TABLE(UDCollisionFITBits_000, "AOD", "UDCOLLFITBITS",
                   udcollfitbits::Thr2W3  /// 2 MIP thresholds for FT0C ch 97 - 112 & FV0 0 - 47
 );
 
-DECLARE_SOA_TABLE_VERSIONED(UDCollisionFITBits_001, "AOD", "UDCOLLFITBITS", 1
+DECLARE_SOA_TABLE_VERSIONED(UDCollisionFITBits_001, "AOD", "UDCOLLFITBITS", 1,
 														o2::soa::Index<>,
 														udcollfitbits::UDCollisionId, /// Link to the UDCOLLISION table  <---- EXTRA
 														udcollfitbits::Thr1W0,        /// 1 MIP thresholds for FT0A ch 0 - ch 63

PWGUD/TableProducer/Converters/CMakeLists.txt

@@ -34,3 +34,8 @@ o2physics_add_dpl_workflow(collisionselextras-converter-v003
   SOURCES UDCollisionSelExtrasV003Converter.cxx
   PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
   COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(fit-bits-converter
+  SOURCES UDFITbitConverter.cxx
+  PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+  COMPONENT_NAME Analysis)	

PWGUD/TableProducer/Converters/UDFITbitConverter.cxx

@@ -0,0 +1,63 @@
+// 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.
+
+/// \file UDCollisionFITBitsConverter.cxx
+/// \brief Converts UDCollisionFITBits table from version 000 to 001
+///
+/// This task converts the UDCollisionFITBits table from version 000,
+/// without an explicit UDCollisionId link, to version 001, which includes
+/// the UDCollisionId column.
+///
+/// The conversion assumes the version-000 table has one row per UDCollision
+/// and follows the same ordering as the UDCollisions table.
+///
+/// executable name o2-analysis-ud-fit-bits-converter
+///
+/// \author Sandor Lokos <sandor.lokos@cern.ch>
+
+#include "PWGUD/DataModel/UDTables.h"
+
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/runDataProcessing.h>
+
+using namespace o2;
+using namespace o2::framework;
+
+// Converts UDCollisionFITBits from version 000 to 001
+struct UDCollisionFITBitsConverter {
+  Produces<o2::aod::UDCollisionFITBits_001> udCollisionFITBits_001;
+
+  void process(o2::aod::UDCollisionFITBits_000 const& fitBits)
+  {
+    udCollisionFITBits_001.reserve(fitBits.size());
+
+    for (const auto& fitBit : fitBits) {
+      udCollisionFITBits_001(fitBit.globalIndex(), // UDCollisionId; version 000 has no explicit link
+                             fitBit.thr1W0(),
+                             fitBit.thr1W1(),
+                             fitBit.thr1W2(),
+                             fitBit.thr1W3(),
+                             fitBit.thr2W0(),
+                             fitBit.thr2W1(),
+                             fitBit.thr2W2(),
+                             fitBit.thr2W3());
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<UDCollisionFITBitsConverter>(cfgc),
+  };
+}

PWGUD/Tasks/upcFITMultiplicity.cxx

@@ -99,6 +99,9 @@ struct UpcTestFITBitMapping {
      {"map/hEtaC_ntracks", "FT0C #eta with >2 tracks;#eta;counts", {HistType::kTH1F, {{5, -3.1, -2.1}}}},
      {"map/hEtaPhiC_ntracks", "FT0C #eta vs #varphi with >2 tracks;#eta;#varphi", {HistType::kTH2F, {{5, -3.1, -2.1}, {9, 0, 2 * M_PI}}}},
 
+		 {"mult/hPnFT0A_raw", "P(n): FT0A fired-channel multiplicity;N_{fired}^{FT0A};events", {HistType::kTH1F, {{97, -0.5, 96.5}}}},
+     {"mult/hPnFT0C_raw", "P(n): FT0C fired-channel multiplicity;N_{fired}^{FT0C};events", {HistType::kTH1F, {{50, -0.5, 49.5}}}},
+     {"mult/hPnFV0A_raw", "P(n): FV0A fired-channel multiplicity;N_{fired}^{FV0A};events", {HistType::kTH1F, {{49, -0.5, 48.5}}}},
      {"mult/hPnFT0A", "P(n): FT0A fired-channel multiplicity;N_{fired}^{FT0A};events", {HistType::kTH1F, {{97, -0.5, 96.5}}}},
      {"mult/hPnFT0C", "P(n): FT0C fired-channel multiplicity;N_{fired}^{FT0C};events", {HistType::kTH1F, {{50, -0.5, 49.5}}}},
      {"mult/hPnFV0A", "P(n): FV0A fired-channel multiplicity;N_{fired}^{FV0A};events", {HistType::kTH1F, {{49, -0.5, 48.5}}}},
@@ -338,11 +341,16 @@ struct UpcTestFITBitMapping {
     const float ft0TimeC = collision.timeFT0C();
     const float ft0AmpA = collision.totalFT0AmplitudeA();
     const float ft0AmpC = collision.totalFT0AmplitudeC();
+    const float fv0AmpA = collision.totalFV0AmplitudeA();
+		
+		registry.fill(HIST("mult/hPnFT0A_raw"), ft0AmpA);
+    registry.fill(HIST("mult/hPnFT0C_raw"), ft0AmpC);
+    registry.fill(HIST("mult/hPnFV0A_raw"), fv0AmpA);
 
     registry.fill(HIST("qaBeforeCuts/hFT0AAmplitudeVsTime"), ft0TimeA, ft0AmpA);
     registry.fill(HIST("qaBeforeCuts/hFT0CAmplitudeVsTime"), ft0TimeC, ft0AmpC);
     registry.fill(HIST("qaBeforeCuts/hZNEnergy"), collision.energyCommonZNA(), collision.energyCommonZNC());
-
+		
     /* Checking collision level cuts */
     if (!collisionPassesCuts(collision)) {
       return;