Merge pull request cms-sw#25 from akalinow/omtfdev

Omtfdev
akalinow · Mar 30, 2015 · 51c881e · 51c881e
2 parents 9da278d + 6c13f24
commit 51c881e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/DataFormats/L1TMuon/src/classes_def.xml b/DataFormats/L1TMuon/src/classes_def.xml
@@ -9,8 +9,8 @@
   <class name="L1TMuon::TriggerPrimitive::DTData" ClassVersion="10">
    <version ClassVersion="10" checksum="2509427716"/>
   </class>
-  <class name="L1TMuon::TriggerPrimitive" ClassVersion="10">
-   <version ClassVersion="10" checksum="189673280"/>
+  <class name="L1TMuon::TriggerPrimitive" ClassVersion="11">
+   <version ClassVersion="11" checksum="3982964189"/>
   </class>
   <class name="edm::Wrapper<L1TMuon::TriggerPrimitive>"/>
   <class name="L1TMuon::TriggerPrimitiveCollection"/>
@@ -20,17 +20,17 @@
   <class name="L1TMuon::TriggerPrimitiveList"/>
   <class name="L1TMuon::TriggerPrimitiveStationMap"/>
 
-  <class name="L1TMuon::InternalTrack" ClassVersion="13">
-   <version ClassVersion="13" checksum="4037012963"/>
+  <class name="L1TMuon::InternalTrack" ClassVersion="14">
+   <version ClassVersion="14" checksum="4609986"/>
   </class>
   <class name="edm::Wrapper<L1TMuon::InternalTrack>"/>
   <class name="L1TMuon::InternalTrackCollection"/>
   <class name="edm::Wrapper<L1TMuon::InternalTrackCollection>"/>
   <class name="L1TMuon::InternalTrackRef"/>
   <class name="L1TMuon::InternalTrackPtr"/>
 
-  <class name="L1TMuon::CandidateTrack" ClassVersion="10">
-   <version ClassVersion="10" checksum="3437363117"/>
+  <class name="L1TMuon::CandidateTrack" ClassVersion="11">
+   <version ClassVersion="11" checksum="376655471"/>
   </class>
   <class name="edm::Wrapper<L1TMuon::CandidateTrack>"/>
   <class name="L1TMuon::CandidateTrackCollection"/>

diff --git a/L1Trigger/L1TMuon/plugins/DiagMaker.cc b/L1Trigger/L1TMuon/plugins/DiagMaker.cc
@@ -69,6 +69,7 @@
 using namespace L1TMuon;
 using namespace edm;
 using namespace reco;
+using namespace std;
 
 typedef edm::ParameterSet PSet;
 

diff --git a/L1Trigger/L1TMuon/src/core_gen_summer_2013/sp_tf.h b/L1Trigger/L1TMuon/src/core_gen_summer_2013/sp_tf.h
@@ -28,7 +28,7 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include <TMath.h>
-#include <TCanvas.h>
+//#include <TCanvas.h>
 #include <TLorentzVector.h>
 
 #include "TTree.h"