Updating code to work with latest models, adding defaults to run on the correlator test bench, and adding missing consts

Author: BenjaminRS

L1Trigger/L1TTrackMatch/plugins/L1TrackVertexAssociationProducer.cc

@@ -204,7 +204,7 @@ class L1TrackVertexAssociationProducer : public edm::global::EDProducer<> {
       inputAssoc.tensor<float, 2>()(0, 3) = dZEmulation_rescale.to_double();
 
       // Run Association Network:
-      tensorflow::run(AssociationSesh_, {{"assoc:0", inputAssoc}}, {"Identity:0"}, &outputAssoc);
+      tensorflow::run(AssociationSesh_, {{"NNvtx_track_association:0", inputAssoc}}, {"Identity:0"}, &outputAssoc);
 
       double NNOutput = (double)outputAssoc[0].tensor<float, 2>()(0, 0);
 

L1Trigger/Phase2L1ParticleFlow/interface/NNVtxAssoc.h

@@ -32,7 +32,7 @@ class NNVtxAssoc {
   static edm::ParameterSetDescription getParameterSetDescription();
 
   template <typename T>
-  bool TTTrackNetworkSelector(const PFRegionEmu& region, T& t, const l1ct::PVObjEmu& v);
+  bool TTTrackNetworkSelector(const PFRegionEmu& region, const T& t, const l1ct::PVObjEmu& v);
 
 private:
   tensorflow::Session* associationSesh_;

L1Trigger/Phase2L1ParticleFlow/interface/puppi/linpuppi_ref.h

@@ -42,12 +42,12 @@ namespace l1ct {
                      double priorNe,
                      double priorPh,
                      pt_t ptCut,
-                     bool useMLAssociation,
-                     const double associationThreshold,
-                     std::string associationGraphPath,
-                     std::vector<double> associationNetworkZ0binning,
-                     std::vector<double> associationNetworkEtaBounds,
-                     std::vector<double> associationNetworkZ0ResBins,
+                     bool useMLAssociation = false,
+                     const double associationThreshold = 0.0,
+                     std::string associationGraphPath = "",
+                     std::vector<double> associationNetworkZ0binning = {},
+                     std::vector<double> associationNetworkEtaBounds = {},
+                     std::vector<double> associationNetworkZ0ResBins = {},
                      unsigned int nFinalSort = 0,
                      SortAlgo finalSortAlgo = SortAlgo::Insertion)
         : nTrack_(nTrack),

L1Trigger/Phase2L1ParticleFlow/src/NNVtxAssoc.cc

@@ -26,7 +26,7 @@ NNVtxAssoc::NNVtxAssoc(std::string AssociationGraphPath,
 }
 
 template <typename T>
-bool NNVtxAssoc::TTTrackNetworkSelector(const PFRegionEmu& region, T& t, const l1ct::PVObjEmu& v) {
+bool NNVtxAssoc::TTTrackNetworkSelector(const PFRegionEmu& region, const T& t, const l1ct::PVObjEmu& v) {
   tensorflow::Tensor inputAssoc(tensorflow::DT_FLOAT, {1, 4});
   std::vector<tensorflow::Tensor> outputAssoc;
 

L1Trigger/VertexFinder/src/VertexFinder.cc

@@ -1114,7 +1114,7 @@ namespace l1tVertexFinder {
 
       // CNN output: track weight
       std::vector<tensorflow::Tensor> outputTrkWeight;
-      tensorflow::run(TrackWeightSesh, {{"weight:0", inputTrkWeight}}, {"Identity:0"}, &outputTrkWeight);
+      tensorflow::run(TrackWeightSesh, {{"NNvtx_input_track_weight:0", inputTrkWeight}}, {"Identity:0"}, &outputTrkWeight);
       // Set track weight pack into tracks:
 
       ap_ufixed<16, 5> NNOutput;
@@ -1165,7 +1165,7 @@ namespace l1tVertexFinder {
     }
 
     // Run PV Network:
-    tensorflow::run(PatternRecSesh, {{"hist:0", inputPV}}, {"Identity:0"}, &outputPV);
+    tensorflow::run(PatternRecSesh, {{"NNvtx_histogram:0", inputPV}}, {"Identity:0"}, &outputPV);
     // Threshold needed due to rounding differences in internal CNN layer emulation versus firmware
     const float histogrammingThreshold_ = 0.0;
     for (int i(0); i < settings_->vx_histogram_numbins(); ++i) {