fixes PR requests

Author: AllaMaevskaya

Common/DataModel/T0infoTable.h

@@ -17,10 +17,10 @@ namespace o2::aod
 {
 namespace infoFT0
 {
-DECLARE_SOA_COLUMN(T0A, t0A, float);
-DECLARE_SOA_COLUMN(T0C, t0C, float);
-DECLARE_SOA_COLUMN(T0AC, t0AC, float);
-DECLARE_SOA_COLUMN(T0vertex, t0vertex, float);
+DECLARE_SOA_COLUMN(T0A, t0A, float);           //! Collision time A-side, corrected with primary vertex
+DECLARE_SOA_COLUMN(T0C, t0C, float);           //! Collision time A-side, corrected with primary vertex
+DECLARE_SOA_COLUMN(T0AC, t0AC, float);         //! Collision time (A+C)/2
+DECLARE_SOA_COLUMN(T0vertex, t0vertex, float); //! FT0 vertex
 } // namespace infoFT0
 DECLARE_SOA_TABLE(T0info, "AOD", "T0info",
                   infoFT0::T0A, infoFT0::T0C,

Common/TableProducer/CMakeLists.txt

@@ -46,6 +46,6 @@ o2physics_add_dpl_workflow(weak-decay-indices
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 o2physics_add_dpl_workflow(ft0-table
-                    SOURCES infoTableFT0producer.cxx
+                    SOURCES FT0Table.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore  O2Physics::AnalysisCCDB O2::DetectorsBase O2::CCDB O2::CommonConstants
                     COMPONENT_NAME Analysis)

Common/TableProducer/FT0Table.cxx

@@ -0,0 +1,74 @@
+// 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/ConfigParamSpec.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+// custom configurable for switching between run2 and run3 selection types
+/*void customize(std::vector<ConfigParamSpec>& workflowOptions)
+{
+  workflowOptions.push_back(ConfigParamSpec{"ccdb-path-ft0", o2::framework::VariantType::String, "http://o2-ccdb.internal/", {"URL of the CCDB database"}});
+  }*/
+
+#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Framework/AnalysisDataModel.h"
+#include "CommonConstants/LHCConstants.h"
+#include "CommonConstants/PhysicsConstants.h"
+#include "Common/DataModel/T0infoTable.h"
+#include <string>
+
+using namespace o2::aod;
+struct FT0Table {
+  Produces<o2::aod::T0info> table;
+  using BCsWithMatchings = soa::Join<aod::BCs, aod::Run3MatchedToBCSparse>;
+  using CollisionEvSel = soa::Join<aod::Collisions, aod::EvSels>::iterator;
+
+  void process(BCsWithMatchings const& bcs, soa::Join<aod::Collisions, aod::EvSels> const& collisions, aod::FT0s const& ft0s)
+  {
+    for (auto& collision : collisions) {
+      int64_t foundFT0 = collision.foundFT0();
+      float vertexPV = collision.posZ();
+      float vertex_corr = vertexPV / o2::constants::physics::LightSpeedCm2NS;
+      float t0A, t0C, t0AC, vertexT0;
+      t0A = t0C = t0AC = vertexT0 = 32000;
+      if (foundFT0 != -1) {
+        auto ft0 = ft0s.iteratorAt(foundFT0);
+        t0A = ft0.timeA();
+        t0C = ft0.timeC();
+        int triggersignals = ft0.triggerMask();
+        bool ora = (triggersignals & (1 << 0)) != 0;
+        bool orc = (triggersignals & (1 << 1)) != 0;
+        bool vertexTrigger = (triggersignals & (1 << 2)) != 0;
+        LOGF(debug, "triggers OrA %i OrC %i vertexTrigger %i", ora, orc, vertexTrigger);
+        LOGF(debug, " T0A = %f, T0C %f, vertex_corr %f, triggersignals %i", t0A, t0C, vertex_corr, triggersignals);
+        if (vertexTrigger) {
+          vertexT0 = o2::constants::physics::LightSpeedCm2NS * (t0C - t0A) / 2;
+          t0AC = (t0A + t0C) / 2;
+        }
+        if (ora) {
+          t0A += vertex_corr;
+        }
+        if (orc) {
+          t0C -= vertex_corr;
+        }
+      }
+      LOGF(debug, " T0 collision time = %f, T0A = %f, T0C = %f, T0 vertex = %f PV = %f", t0A, t0C, t0AC, vertexT0, vertexPV);
+      table(t0A, t0C, t0AC, vertexT0);
+    }
+  }
+};
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{adaptAnalysisTask<FT0Table>(cfgc, TaskName{"ft0-table"})};
+}

Common/Tasks/ft0infoQaTask.cxx

@@ -45,12 +45,12 @@ struct FT0InfoQaTask {
     int64_t foundFT0 = col.foundFT0();
     if (foundFT0 != -1) {
       LOGF(info, "multV0A=%5.0f;  multT0A=%5.0f; PV=%f; T0vertex=%f;T0A=%f; T0C=%f; T0AC=%f ", col.multV0A(), col.multT0A(), col.posZ(), col.t0A(), col.t0C(), col.t0AC(), col.t0vertex());
-      /*      hT0A->Fill(col.t0A());
+      hT0A->Fill(col.t0A());
       hT0C->Fill(col.t0C());
       hT0AC->Fill(col.t0AC());
       hT0Vertex->Fill(col.t0vertex());
       hVertex_T0_PV->Fill(col.t0vertex(), col.posZ());
-      hT0res->Fill((col.t0A()-col.t0C())/2.);*/
+      hT0res->Fill((col.t0A()-col.t0C())/2.);
     }
   }
 };