Update

Author: njacazio

ALICE3/TableProducer/OTF/onTheFlyDetectorGeometryProvider.cxx

@@ -44,7 +44,7 @@ struct OnTheFlyDetectorGeometryProvider {
       return;
     }
     int idx = 0;
-    for (auto& configFile : detectorConfiguration.value) {
+    for (std::string& configFile : detectorConfiguration.value) {
       LOG(info) << "Loading detector geometry from configuration file: " << configFile;
       histos.add<TH1>(Form("GeometryConfigFile_%d", idx), configFile.c_str(), o2::framework::HistType::kTH1D, {{1, 0, 1}})->Fill(0.5);
       // If the filename starts with ccdb: then take the file from the ccdb

ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

@@ -728,6 +728,7 @@ struct OnTheFlyRichPid {
 
     std::array<float, 6> mcPvCov = {0.};
     o2::dataformats::VertexBase mcPvVtx({0.0f, 0.0f, 0.0f}, mcPvCov);
+    return;
     if (collision.has_mcCollision()) {
       auto mcCollision = collision.mcCollision();
       mcPvVtx.setX(mcCollision.posX());

ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx

@@ -732,7 +732,7 @@ struct OnTheFlyTofPid {
 
       // Now we calculate the expected arrival time following certain mass hypotheses
       // and the (imperfect!) reconstructed track parametrizations
-      float trackLengthRecoInnerTOF = -1, trackLengthRecoOuterTOF = -1;
+      float trackLengthRecoInnerTOF = 20, trackLengthRecoOuterTOF = 20;
       auto recoTrack = getTrackParCov(track);
       xPv = -100.f;
       if (recoTrack.propagateToDCA(pvVtx, mMagneticField)) {
@@ -742,6 +742,9 @@ struct OnTheFlyTofPid {
         trackLengthRecoInnerTOF = computeTrackLength(recoTrack, simConfig.innerTOFRadius, mMagneticField);
         trackLengthRecoOuterTOF = computeTrackLength(recoTrack, simConfig.outerTOFRadius, mMagneticField);
       }
+      // trackLengthRecoInnerTOF = trackLengthInnerTOF;
+      // trackLengthRecoOuterTOF = trackLengthOuterTOF;
+      // LOG(info) << "Track lengths: true innerTOF " << trackLengthInnerTOF << " cm, reco innerTOF " << trackLengthRecoInnerTOF << " cm";
 
       // cache the track info needed for the event time calculation
       // Reuse or emplace a new object in the vector

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -42,6 +42,7 @@
 #include <DetectorsBase/Propagator.h>
 #include <DetectorsVertexing/PVertexer.h>
 #include <DetectorsVertexing/PVertexerHelpers.h>
+#include <DetectorsVertexing/PVertexerParams.h>
 #include <Field/MagneticField.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
@@ -474,6 +475,7 @@ struct OnTheFlyTracker {
 
     if (doExtraQA) {
       histos.add("h2dVerticesVsContributors", "h2dVerticesVsContributors", kTH2F, {axes.axisMultiplicity, axes.axisNVertices});
+      histos.add("h1dVerticesNotReco", "h1dVerticesNotReco", kTH1F, {axes.axisMultiplicity});
       histos.add("hRecoVsSimMultiplicity", "hRecoVsSimMultiplicity", kTH2F, {axes.axisMultiplicity, axes.axisMultiplicity});
 
       histos.add("hSimTrackX", "hSimTrackX", kTH1F, {axes.axisX});
@@ -554,9 +556,13 @@ struct OnTheFlyTracker {
     irSampler.init();
 
     vertexer.setValidateWithIR(kFALSE);
+    vertexer.setTrackSources(o2::dataformats::GlobalTrackID::ITS);
     vertexer.setBunchFilling(irSampler.getBunchFilling());
+    vertexer.setBz(mMagneticField);
     vertexer.init();
 
+    o2::vertexing::PVertexerParams::Instance().printKeyValues();
+
     // initialize O2 2-prong fitter
     fitter.setPropagateToPCA(true);
     fitter.setMaxR(200.);
@@ -1361,7 +1367,7 @@ struct OnTheFlyTracker {
     // data preparation
     o2::vertexing::PVertex primaryVertex;
     if (enablePrimaryVertexing) {
-      LOG(debug) << "Starting primary vertexing with " << tracksAlice3.size() << " tracks.";
+      LOG(info) << "Starting primary vertexing with " << tracksAlice3.size() << " tracks.";
       std::vector<o2::MCCompLabel> lblTracks;
       std::vector<o2::vertexing::PVertex> vertices;
       std::vector<o2::vertexing::GIndex> vertexTrackIDs;
@@ -1387,8 +1393,13 @@ struct OnTheFlyTracker {
                                               lblVtx);
 
       if (n_vertices < 1) {
+        LOG(info) << "Vertexing completed, no vtx found.";
+        if (doExtraQA) {
+          histos.fill(HIST("h1dVerticesNotReco"), tracksAlice3.size());
+        }
         return; // primary vertex not reconstructed
       }
+      LOG(info) << "Vertexing completed with " << n_vertices << " vertices found.";
 
       // Find largest vertex
       int largestVertex = 0;

ALICE3/TableProducer/alice3TrackingTranslator.cxx

@@ -70,7 +70,7 @@ struct Alice3TrackingTranslator {
   o2::framework::Produces<o2::aod::McCollisions> tableMcCollisions;
   o2::framework::Produces<o2::aod::OTFLUTConfigId> tableOTFLUTConfigId;
 
-  o2::framework::Configurable<int> maxCollisions{"maxCollisions", 1000, "Nsigma for TOF PID (if enabled)"};
+  o2::framework::Configurable<int> maxCollisions{"maxCollisions", -1000, "Nsigma for TOF PID (if enabled)"};
 
   void init(o2::framework::InitContext&)
   {
@@ -257,7 +257,7 @@ struct Alice3TrackingTranslator {
 
     const Long64_t kEvents = fileParticles.getEntries();
     for (Long64_t iEvent = 0; iEvent < kEvents; ++iEvent) {
-      if (iEvent > 0 && iEvent % maxCollisions) {
+      if (iEvent > 0 && maxCollisions.value > 0 && (iEvent % maxCollisions) == 0) {
         LOG(info) << "Processing event " << iEvent << "/" << kEvents;
         break;
       }
@@ -587,6 +587,12 @@ struct Alice3TrackingTranslator {
   }
 };
 
+/// Extends TracksExtra if necessary
+struct Alice3TrackingTranslatorInitializer {
+  o2::framework::Spawns<o2::aod::TracksExtra> tableStoredTracksExtra;
+  void init(o2::framework::InitContext const&) {}
+};
+
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc)
 {
   o2::framework::WorkflowSpec w;
@@ -599,5 +605,6 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
     }
   }
   w.push_back(adaptAnalysisTask<Alice3TrackingTranslator>(cfgc));
+  // w.push_back(adaptAnalysisTask<Alice3TrackingTranslatorInitializer>(cfgc));
   return w;
 }

ALICE3/Tasks/alice3HfTask3Prong.cxx

@@ -423,6 +423,7 @@ struct Alice3HfTask3Prong {
   {
     // MC gen.
     for (const auto& particle : mcParticles) {
+      // LOG(info) << "Processing MC generated particle with PDG " << particle.pdgCode() << " and flagMcGen " << particle.flagMcGen() << " " << selectedPdg;
       if (std::abs(particle.flagMcGen()) == selectedPdg) {
         double yGen = hfHelper.getCandY<CharmHad>(particle);
         if (yCandGenMax >= 0. && std::abs(yGen) > yCandGenMax) {