code check updates

cms-sw · Dec 22, 2023 · 3c1d656 · 3c1d656
1 parent b415b1c
commit 3c1d656
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/L1Trigger/Phase2L1ParticleFlow/interface/JetId.h b/L1Trigger/Phase2L1ParticleFlow/interface/JetId.h
@@ -22,15 +22,18 @@ struct BJetTFCache {
 
 class JetId {
 public:
-  JetId(const std::string &iInput, const std::string &iOutput, const std::shared_ptr<hls4mlEmulator::Model> model, int iNParticles);
+  JetId(const std::string &iInput,
+        const std::string &iOutput,
+        const std::shared_ptr<hls4mlEmulator::Model> model,
+        int iNParticles);
   JetId(const std::string &iInput, const std::string &iOutput, const BJetTFCache *cache, int iNParticles);
   ~JetId();
 
   void setNNVectorVar();
   float EvaluateNN();
-  ap_fixed<16,6> EvaluateNNFixed();
+  ap_fixed<16, 6> EvaluateNNFixed();
   float compute(const l1t::PFJet &iJet, float vz, bool useRawPt);
-  ap_fixed<16,6> computeFixed(const l1t::PFJet &iJet, float vz, bool useRawPt);
+  ap_fixed<16, 6> computeFixed(const l1t::PFJet &iJet, float vz, bool useRawPt);
 
 private:
   std::vector<float> NNvectorVar_;

diff --git a/L1Trigger/Phase2L1ParticleFlow/plugins/TOoLLiPProducer.cc b/L1Trigger/Phase2L1ParticleFlow/plugins/TOoLLiPProducer.cc
@@ -55,11 +55,11 @@ TOoLLiPProducer::TOoLLiPProducer(const edm::ParameterSet& cfg)
       fMaxJets_(cfg.getParameter<int>("maxJets")),
       fNParticles_(cfg.getParameter<int>("nParticles")),
       fVtxEmu_(consumes<std::vector<l1t::VertexWord>>(cfg.getParameter<edm::InputTag>("vtx"))),
-      loader(hls4mlEmulator::ModelLoader(cfg.getParameter<string>("TOoLLiPVersion"))) 
-      {
+      loader(hls4mlEmulator::ModelLoader(cfg.getParameter<string>("TOoLLiPVersion"))) {
   //load model and feed to JetID
   model = loader.load_model();
-  fJetId_ = std::make_unique<JetId>(cfg.getParameter<std::string>("NNInput"), cfg.getParameter<std::string>("NNOutput"), model, fNParticles_);
+  fJetId_ = std::make_unique<JetId>(
+      cfg.getParameter<std::string>("NNInput"), cfg.getParameter<std::string>("NNOutput"), model, fNParticles_);
   //produces<float>("L1LLPScores");
   produces<edm::ValueMap<float>>("L1PFLLPJets");
 }
@@ -78,14 +78,14 @@ void TOoLLiPProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
     }
   }
 
- std::vector<float> LLPScores;
- for (const auto& srcjet : *jets) {
+  std::vector<float> LLPScores;
+  for (const auto& srcjet : *jets) {
     if (((fUseRawPt_ ? srcjet.rawPt() : srcjet.pt()) < fMinPt_) || std::abs(srcjet.eta()) > fMaxEta_ ||
         LLPScores.size() >= fMaxJets_) {
       LLPScores.push_back(-1.);
       continue;
     }
-    ap_fixed<16, 6> LLPScore = fJetId_->computeFixed(srcjet, vz, fUseRawPt_); 
+    ap_fixed<16, 6> LLPScore = fJetId_->computeFixed(srcjet, vz, fUseRawPt_);
     LLPScores.push_back(LLPScore);
   }
 
@@ -102,7 +102,8 @@ void TOoLLiPProducer::fillDescriptions(edm::ConfigurationDescriptions& descripti
   desc.add<edm::InputTag>("jets", edm::InputTag("scPFL1Puppi"));
   desc.add<bool>("useRawPt", true);
   //change for LLP
-  desc.add<std::string>("TOoLLiPVersion", std::string("/src/L1Trigger/Phase2L1ParticleFlow/test/TOoLLip_emulator_v1.so"));
+  desc.add<std::string>("TOoLLiPVersion",
+                        std::string("/src/L1Trigger/Phase2L1ParticleFlow/test/TOoLLip_emulator_v1.so"));
   desc.add<std::string>("NNInput", "input:0");
   desc.add<std::string>("NNOutput", "sequential/dense_2/Sigmoid");
   desc.add<int>("maxJets", 10);

diff --git a/L1Trigger/Phase2L1ParticleFlow/src/JetId.cc b/L1Trigger/Phase2L1ParticleFlow/src/JetId.cc
@@ -2,8 +2,11 @@
 #include "DataFormats/Math/interface/deltaPhi.h"
 #include <cmath>
 
-JetId::JetId(const std::string &iInput, const std::string &iOutput, const std::shared_ptr<hls4mlEmulator::Model> model, int iNParticles) 
-    :modelRef_(model){
+JetId::JetId(const std::string &iInput,
+             const std::string &iOutput,
+             const std::shared_ptr<hls4mlEmulator::Model> model,
+             int iNParticles)
+    : modelRef_(model) {
   NNvectorVar_.clear();
   fNParticles_ = iNParticles;
 
@@ -72,18 +75,18 @@ float JetId::EvaluateNN() {
   return outputs[0].matrix<float>()(0, 0);
 }  //end EvaluateNN
 
-ap_fixed<16,6> JetId::EvaluateNNFixed() {
-  ap_fixed<16,6> modelInput[140]={};
+ap_fixed<16, 6> JetId::EvaluateNNFixed() {
+  ap_fixed<16, 6> modelInput[140] = {};
   for (unsigned int i = 0; i < NNvectorVar_.size(); i++) {
     modelInput[i] = NNvectorVar_[i];
   }
-  ap_fixed<16,6> modelResult = -1;
+  ap_fixed<16, 6> modelResult = -1;
   //for (int i = 0; i < 1; i++) {
   //  modelResult[i] = -1;
   //}
 
   modelRef_->prepare_input(modelInput);
-  modelRef_->predict();  
+  modelRef_->predict();
   modelRef_->read_result(modelResult);
   return modelResult;
 }  //end EvaluateNN