Merge pull request #2 from mmasciov/mmasciovScoutingMuonRun3Format

Fix code formatting according to scram build code-format
trackreco · Nov 4, 2020 · 72d1243 · 72d1243
2 parents 87f3a41 + f7f9526
commit 72d1243
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/DataFormats/Scouting/interface/ScoutingMuon.h b/DataFormats/Scouting/interface/ScoutingMuon.h
@@ -63,7 +63,7 @@ class ScoutingMuon {
                float trk_vx,
                float trk_vy,
                float trk_vz,
-	       reco::HitPattern trk_hitPattern,
+               reco::HitPattern trk_hitPattern,
                std::vector<int> vtxIndx)
       : pt_(pt),
         eta_(eta),

diff --git a/DataFormats/Scouting/src/classes_def.xml b/DataFormats/Scouting/src/classes_def.xml
@@ -14,19 +14,21 @@
       <version ClassVersion="2"  checksum="2969738609"/>
       <version ClassVersion="3" checksum="4008726838"/>
   </class>
-  <class name="ScoutingElectron" ClassVersion="3">
+  <class name="ScoutingElectron" ClassVersion="4">
       <version ClassVersion="2" checksum="1190461538"/>
       <version ClassVersion="3" checksum="213189975"/>
+      <version ClassVersion="4" checksum="1208587038"/>
   </class>
   <class name="ScoutingMuon" ClassVersion="5">
      <version ClassVersion="2" checksum="9151"/>
      <version ClassVersion="3" checksum="3167554832"/>
      <version ClassVersion="4" checksum="2090828742"/>
      <version ClassVersion="5" checksum="2821723317"/>
   </class>
-  <class name="ScoutingPhoton" ClassVersion="3">
+  <class name="ScoutingPhoton" ClassVersion="4">
       <version ClassVersion="2" checksum="2797410539"/>
       <version ClassVersion="3" checksum="876375717"/>
+      <version ClassVersion="4" checksum="2351045916"/>
   </class>
   <class name="ScoutingTrack" ClassVersion="3">
       <version ClassVersion="2" checksum="1342928770"/>

diff --git a/HLTrigger/Muon/plugins/HLTScoutingMuonProducer.cc b/HLTrigger/Muon/plugins/HLTScoutingMuonProducer.cc
@@ -161,14 +161,14 @@ void HLTScoutingMuonProducer::produce(edm::StreamID sid, edm::Event& iEvent, edm
         dPt = dPt / track->pt();
 
       if (dR2 < 0.02 * 0.02 and dPt < 0.001) {
-	if(link.standAloneTrack().isNonnull()){
-	  validStandAloneMuonHits = link.standAloneTrack()->hitPattern().numberOfValidMuonHits();
-	  matchedStandAloneMuonStations = link.standAloneTrack()->hitPattern().muonStationsWithValidHits();
-	}
+        if (link.standAloneTrack().isNonnull()) {
+          validStandAloneMuonHits = link.standAloneTrack()->hitPattern().numberOfValidMuonHits();
+          matchedStandAloneMuonStations = link.standAloneTrack()->hitPattern().muonStationsWithValidHits();
+        }
       }
     }
 
-    unsigned int recoMuonType = 2; // Global muon
+    unsigned int recoMuonType = 2;  // Global muon
     float normalizedChi2 = 999.0;
     int nRecoMuonValidMuonHits = 0;
     int nRecoMuonChambers = 0;
@@ -186,10 +186,10 @@ void HLTScoutingMuonProducer::produce(edm::StreamID sid, edm::Event& iEvent, edm
         dPt = dPt / muon.pt();
 
       if (dR2 < 0.02 * 0.02 and dPt < 0.001) {
-	if(recoMu.globalTrack().isNonnull()){
-	  normalizedChi2  = recoMu.globalTrack()->normalizedChi2();
-	  nRecoMuonValidMuonHits = recoMu.globalTrack()->hitPattern().numberOfValidMuonHits();
-	}
+        if (recoMu.globalTrack().isNonnull()) {
+          normalizedChi2 = recoMu.globalTrack()->normalizedChi2();
+          nRecoMuonValidMuonHits = recoMu.globalTrack()->hitPattern().numberOfValidMuonHits();
+        }
         recoMuonType = recoMu.type();
         nRecoMuonChambers = recoMu.numberOfChambers();
         nRecoMuonChambersCSCorDT = recoMu.numberOfChambersCSCorDT();
@@ -304,7 +304,8 @@ void HLTScoutingMuonProducer::fillDescriptions(edm::ConfigurationDescriptions& d
   desc.add<edm::InputTag>("Tracks", edm::InputTag("hltPixelTracks"));
   desc.add<edm::InputTag>("EcalPFClusterIsoMap", edm::InputTag("hltMuonEcalMFPFClusterIsoForMuonsNoVtx"));
   desc.add<edm::InputTag>("HcalPFClusterIsoMap", edm::InputTag("hltMuonHcalPFClusterIsoForMuonsNoVtx"));
-  desc.add<edm::InputTag>("TrackIsoMap", edm::InputTag("hltMuonTkRelIsolationCut0p09MapNoVtx:combinedRelativeIsoDeposits"));
+  desc.add<edm::InputTag>("TrackIsoMap",
+                          edm::InputTag("hltMuonTkRelIsolationCut0p09MapNoVtx:combinedRelativeIsoDeposits"));
   desc.add<double>("muonPtCut", 3.0);
   desc.add<double>("muonEtaCut", 2.4);
   desc.add<double>("minVtxProbCut", 0.001);