yay! all done

LDMX-Software · Sep 19, 2024 · 892b19f · 892b19f
1 parent ee51194
commit 892b19f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/TrigScint/CMakeLists.txt b/TrigScint/CMakeLists.txt
@@ -40,10 +40,12 @@ if(BUILD_EVENT_ONLY)
 
 endif()
 
+setup_library(module TrigScint name Firmware)
+target_include_directories(TrigScint_Firmware PUBLIC ../Trigger/HLS_arbitrary_Precision_Types/include)
 setup_library(module TrigScint
               dependencies Framework::Framework Recon::Event DetDescr::DetDescr
                            Tools::Tools SimCore::Event
+	      Tools::Tools SimCore::Event TrigScint::Firmware
 )
-target_include_directories(TrigScint PUBLIC ../Trigger/HLS_arbitrary_Precision_Types/include)
 setup_python(package_name LDMX/TrigScint)
 
diff --git a/TrigScint/exampleConfigs/firmwareEx.py b/TrigScint/exampleConfigs/firmwareEx.py
@@ -162,7 +162,7 @@
      logEvents = p.maxEvents
 p.logFrequency = int( p.maxEvents/logEvents )
 
-json.dumps(p.parameterDump(), indent=2)
+#json.dumps(p.parameterDump(), indent=2)
 
 with open('parameterDump.json', 'w') as outfile:
      json.dump(p.parameterDump(),  outfile, indent=4)
diff --git a/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx b/TrigScint/src/TrigScint/Firmware/clusterproducer_sw.cxx
@@ -11,7 +11,7 @@ std::array<Cluster, NCLUS> clusterproducer_sw(Hit inHit[NHITS]) {
 
   ap_int<12> mapL1[NCHAN];
 
-  std::unique_ptr<Cluster[]> outClus(new Cluster[NCLUS]);
+  std::array<Cluster,NCLUS> outClus;
 
   for (int i = 0; i < NCLUS; ++i) {
     clearClus(outClus[i]);

diff --git a/TrigScint/src/TrigScint/TrigScintFirmwareTracker.cxx b/TrigScint/src/TrigScint/TrigScintFirmwareTracker.cxx
@@ -271,6 +271,11 @@ void TrigScintFirmwareTracker::produce(framework::Event &event) {
   // into the trackproducer_hw to create the track collection I use makeTrack to
   // revert the firmware track object back into a regular track object for
   // analysis purposes
+  //
+  // NOTE: Pad1 has NTRK instead of NCLUS clusters for a reason: the firmware cannot
+  // facilitate NCLUS many tracks within its alloted bandwidth , we have to put a cut
+  // on them which is facilitated by a cut on the number of clusters in Pad1. Do
+  // not change this.
   trackproducer_hw(Pad1, Pad2, Pad3, outTrk, LOOKUP);
   for (int I = 0; I < NTRK; I++) {
     if (outTrk[I].Pad1.Seed.Amp > 0) {