Merge branch 'main' into pr/BTOF-digitization-clusterization

eic · Nov 18, 2024 · ce7b6a0 · ce7b6a0
2 parents 22c9fe4 + 0fcd81f
commit ce7b6a0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h b/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h
@@ -38,6 +38,8 @@ namespace eicrecon {
     float rMinMiddle       = 20. * Acts::UnitConstants::mm; // Middle spacepoint must fall between these two radii
     float rMaxMiddle       = 400. * Acts::UnitConstants::mm;
 
+    float deltaPhiMax      = 0.085; // Max difference in phi between middle and either top or bottom sp
+
     //////////////////////////////////////////////////////////////////////////
     /// SEED FILTER GENERAL PARAMETERS
     /// The parameters below control the process of filtering out seeds before

diff --git a/src/algorithms/tracking/TrackSeeding.cc b/src/algorithms/tracking/TrackSeeding.cc
@@ -104,6 +104,7 @@ void eicrecon::TrackSeeding::configure() {
     m_seedFinderConfig.impactMax          = m_cfg.impactMax;
     m_seedFinderConfig.rMinMiddle         = m_cfg.rMinMiddle;
     m_seedFinderConfig.rMaxMiddle         = m_cfg.rMaxMiddle;
+    m_seedFinderConfig.deltaPhiMax        = m_cfg.deltaPhiMax;
 
     m_seedFinderOptions.beamPos   = Acts::Vector2(m_cfg.beamPosX, m_cfg.beamPosY);
     m_seedFinderOptions.bFieldInZ = m_cfg.bFieldInZ;

diff --git a/src/algorithms/tracking/TrackerMeasurementFromHits.cc b/src/algorithms/tracking/TrackerMeasurementFromHits.cc
@@ -125,7 +125,7 @@ namespace eicrecon {
             meas2D.setLoc({static_cast<float>(pos[0]),static_cast<float>(pos[1])});                     // 2D location on surface
             meas2D.setTime(hit.getTime());                     // Measurement time
             // fixme: no off-diagonal terms. cov(0,1) = cov(1,0)??
-            meas2D.setCovariance({cov(0,0),cov(1,1),hit.getTimeError(),cov(0,1)}); // Covariance on location and time
+            meas2D.setCovariance({cov(0,0), cov(1,1), hit.getTimeError() * hit.getTimeError(), cov(0,1)}); // Covariance on location and time
             meas2D.addToWeights(1.0);                             // Weight for each of the hits, mirrors hits array
             meas2D.addToHits(hit);
         }

diff --git a/src/global/tracking/TrackSeeding_factory.h b/src/global/tracking/TrackSeeding_factory.h
@@ -50,6 +50,7 @@ class TrackSeeding_factory :
     ParameterRef<float> m_impactMax {this, "impactMax", config().impactMax, "maximum impact parameter allowed for seeds for Acts::OrthogonalSeedFinder. rMin should be larger than impactMax."};
     ParameterRef<float> m_rMinMiddle {this, "rMinMiddle", config().rMinMiddle, "min radius for middle space point for Acts::OrthogonalSeedFinder"};
     ParameterRef<float> m_rMaxMiddle {this, "rMaxMiddle", config().rMaxMiddle, "max radius for middle space point for Acts::OrthogonalSeedFinder"};
+    ParameterRef<float> m_deltaPhiMax {this, "deltaPhiMax", config().deltaPhiMax, "Max phi difference between middle and top/bottom space point"};
     ParameterRef<float> m_locaError {this, "loc_a_Error", config().locaError, "Error on Loc a for Acts::OrthogonalSeedFinder"};
     ParameterRef<float> m_locbError {this, "loc_b_Error", config().locbError, "Error on Loc b for Acts::OrthogonalSeedFinder"};
     ParameterRef<float> m_phiError {this, "phi_Error", config().phiError, "Error on phi for Acts::OrthogonalSeedFinder"};

diff --git a/src/services/io/podio/JEventSourcePODIO.cc b/src/services/io/podio/JEventSourcePODIO.cc
@@ -174,7 +174,7 @@ void JEventSourcePODIO::Open() {
 //------------------------------------------------------------------------------
 void JEventSourcePODIO::Close() {
     // m_reader.close();
-    // TODO: ROOTFrameReader does not appear to have a close() method.
+    // TODO: ROOTReader does not appear to have a close() method.
 }
 
 
@@ -196,7 +196,7 @@ void JEventSourcePODIO::GetEvent(std::shared_ptr<JEvent> event) {
             Nevents_read = 0;
         }else{
             // m_reader.close();
-            // TODO:: ROOTFrameReader does not appear to have a close() method.
+            // TODO:: ROOTReader does not appear to have a close() method.
             throw RETURN_STATUS::kNO_MORE_EVENTS;
         }
     }

diff --git a/src/services/io/podio/JEventSourcePODIO.h b/src/services/io/podio/JEventSourcePODIO.h
@@ -8,7 +8,12 @@
 #include <JANA/JEvent.h>
 #include <JANA/JEventSource.h>
 #include <JANA/JEventSourceGeneratorT.h>
+#include <podio/podioVersion.h>
+#if podio_VERSION >= PODIO_VERSION(0, 99, 0)
+#include <podio/ROOTReader.h>
+#else
 #include <podio/ROOTFrameReader.h>
+#endif
 #include <stddef.h>
 #include <memory>
 #include <set>
@@ -32,7 +37,12 @@ class JEventSourcePODIO : public JEventSource {
     void PrintCollectionTypeTable(void);
 
 protected:
+#if podio_VERSION >= PODIO_VERSION(0, 99, 0)
+    podio::ROOTReader m_reader;
+#else
     podio::ROOTFrameReader m_reader;
+#endif
+
     size_t Nevents_in_file = 0;
     size_t Nevents_read = 0;