update making of mstorage and finer

Core/include/Acts/Seeding/GNN_DataStorage.hpp

@@ -4,12 +4,13 @@
 #include<map>
 #include<algorithm>
 
-#define MAX_SEG_PER_NODE 1000 //was 30
-#define N_SEG_CONNS  6 //was 6
-
 #include "Acts/Seeding/GNN_Geometry.hpp"
 
 namespace Acts {
+
+constexpr size_t MAX_SEG_PER_NODE = 1000; //was 30
+constexpr size_t N_SEG_CONNS = 6; //was 6
+
 template <typename space_point_t>  
 class TrigFTF_GNN_Node {
  public:

Core/include/Acts/Seeding/GNN_Geometry.hpp

@@ -329,8 +329,6 @@ class TrigFTF_GNN_Geometry {
 
       return nullptr;
     }
-
-
 
     return (*it).second;
   }

Core/include/Acts/Seeding/SeedFinderFTF.hpp

@@ -77,6 +77,15 @@ class SeedFinderFTF {
 
 
   //needs to be memeber of class so can accessed by all memeber functions 
+
+  //trying to move geo from finder constructor to geo into here 
+  std::ifstream input_ifstream = std::ifstream(m_config.fastrack_input_file.c_str(), std::ifstream::in) ;
+
+  FasTrackConnector input_fastrack= FasTrackConnector(input_ifstream) ; 
+
+  TrigFTF_GNN_Geometry<external_spacepoint_t> mGNNgeo =  TrigFTF_GNN_Geometry<external_spacepoint_t>(m_config.input_vector, &input_fastrack);
+
+
   TrigFTF_GNN_DataStorage<external_spacepoint_t>* m_storage;
 
 }; 

Core/include/Acts/Seeding/SeedFinderFTF.ipp

@@ -35,11 +35,11 @@ SeedFinderFTF<external_spacepoint_t>::SeedFinderFTF(
   //       "SeedFinderOrthogonal");
 
 
-  std::ifstream input_ifstream(m_config.fastrack_input_file.c_str(), std::ifstream::in) ;
+  // std::ifstream input_ifstream(m_config.fastrack_input_file.c_str(), std::ifstream::in) ;
 
-  FasTrackConnector input_fastrack(input_ifstream) ; 
+  // FasTrackConnector input_fastrack(input_ifstream) ; 
 
-  TrigFTF_GNN_Geometry<external_spacepoint_t> mGNNgeo(m_config.input_vector, &input_fastrack);
+  // TrigFTF_GNN_Geometry<external_spacepoint_t> mGNNgeo(m_config.input_vector, &input_fastrack);
 
   m_storage = new TrigFTF_GNN_DataStorage(mGNNgeo);
 

Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingFTFAlgorithm.hpp

@@ -70,7 +70,7 @@ class SeedingFTFAlgorithm final : public IAlgorithm {
 
  private: 
   Config m_cfg; 
-  // Acts::SeedFinderFTF<SimSpacePoint> m_seedFinder; 
+  // std::unique_ptr<Acts::SeedFinderFTF<SimSpacePoint>> m_seedFinder; 
 
   std::vector<std::unique_ptr<ReadDataHandle<SimSpacePointContainer>>>
       m_inputSpacePoints{};

Examples/Algorithms/TrackFinding/src/SeedingFTFAlgorithm.cpp

@@ -74,7 +74,7 @@ ActsExamples::SeedingFTFAlgorithm::SeedingFTFAlgorithm(
       std::make_unique<Acts::SeedFilter<SimSpacePoint>>(
           Acts::SeedFilter<SimSpacePoint>(m_cfg.seedFilterConfig));    
 
-    // m_seedFinder = Acts::SeedFinderFTF<SimSpacePoint>(m_cfg.seedFinderConfig);   
+    // m_seedFinder = std::make_unique<Acts::SeedFinderFTF<SimSpacePoint>>(m_cfg.seedFinderConfig) ; 
       } //this is not FTF config type because it is a meber of the algs config, which is of type FTF cofig  
 
 
@@ -88,15 +88,17 @@ ActsExamples::ProcessCode ActsExamples::SeedingFTFAlgorithm::execute(
   std::vector<Acts::FTF_SP<SimSpacePoint>> FTF_spacePoints = Make_FTF_spacePoints(ctx, m_cfg.ACTS_FTF_Map);
 
 
-  // //loop over FTF_SP vector to plot the space points 
-  // fstream fout;
-  // fout.open("FTF_SP_output.csv", ios::out | ios::app);
-  // for (auto sp : FTF_spacePoints){
-  //   fout << sp.FTF_ID << ", "
-  //     << sp.SP->z() << ", "
-  //     << sp.SP->r() 
-  //     << "\n";
-  // }      
+  //loop over FTF_SP vector to plot the space points 
+  fstream fout;
+  fout.open("FTF_SP_output.csv", ios::out | ios::app);
+  for (auto sp : FTF_spacePoints){
+    int eta_mod_input = sp.combined_ID -sp.FTF_ID*1000 ; 
+    fout << sp.FTF_ID << ", "
+      << sp.SP->z() << ", "
+      << sp.SP->r() << ", "
+      << eta_mod_input //should hopefully be eta mod 
+      << "\n";
+  }      
 
 
   for (auto sp : FTF_spacePoints){
@@ -108,6 +110,7 @@ ActsExamples::ProcessCode ActsExamples::SeedingFTFAlgorithm::execute(
   //this is now calling on a core algorithm
   Acts::SeedFinderFTF<SimSpacePoint> finder(m_cfg.seedFinderConfig);  
 
+
   //need this function as create_coords is needed for seeds 
   std::function<std::pair<Acts::Vector3, Acts::Vector2>(
       const SimSpacePoint *sp)>
@@ -118,14 +121,15 @@ ActsExamples::ProcessCode ActsExamples::SeedingFTFAlgorithm::execute(
       };  
       //output of function needed for seed     
 
-  finder.loadSpacePoints(FTF_spacePoints);      
 
+  finder.loadSpacePoints(FTF_spacePoints);       
+
 
   //still to develop
   SimSeedContainer seeds = finder.createSeeds(m_cfg.seedFinderOptions,
                                               FTF_spacePoints, create_coordinates);
-
-                             
+       
+
   m_outputSeeds(ctx, std::move(seeds));
 
 

Examples/Scripts/Python/full_chain_itk.py

@@ -33,7 +33,7 @@
 field = acts.examples.MagneticFieldMapXyz(str(geo_dir / "bfield/ATLAS-BField-xyz.root"))
 rnd = acts.examples.RandomNumbers(seed=42)
 
-s = acts.examples.Sequencer(events=100, numThreads=-1, outputDir=str(outputDir))
+s = acts.examples.Sequencer(events=100, numThreads=1, outputDir=str(outputDir)) #-1 threads is max it can do 
 
 if not ttbar_pu200:
     addParticleGun(