73X - event number 32 to 64 bits

CommonTools/UtilAlgos/interface/NtpProducer.h

@@ -13,6 +13,7 @@
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "CommonTools/Utils/interface/StringObjectFunction.h"
 
@@ -49,7 +50,7 @@ NtpProducer<C>::NtpProducer( const edm::ParameterSet& par ) :
    std::vector<edm::ParameterSet>::const_iterator
      q = variables.begin(), end = variables.end();
    if(eventInfo_){
-     produces<unsigned int>( prefix_+"EventNumber" ).setBranchAlias( prefix_ + "EventNumber" );
+     produces<edm::EventNumber_t>( prefix_+"EventNumber" ).setBranchAlias( prefix_ + "EventNumber" );
      produces<unsigned int>( prefix_ + "RunNumber" ).setBranchAlias( prefix_ + "RunNumber" );
      produces<unsigned int>( prefix_ + "LumiBlock" ).setBranchAlias( prefix_ + "Lumiblock" );
    }
@@ -71,7 +72,7 @@ void NtpProducer<C>::produce( edm::Event& iEvent, const edm::EventSetup&) {
    edm::Handle<C> coll;
    iEvent.getByToken(srcToken_, coll);
    if(eventInfo_){
-     std::auto_ptr<unsigned int> event( new unsigned int );
+     std::auto_ptr<edm::EventNumber_t> event( new edm::EventNumber_t );
      std::auto_ptr<unsigned int> run( new unsigned int );
      std::auto_ptr<unsigned int> lumi( new unsigned int );
      *event = iEvent.id().event();

ElectroWeakAnalysis/ZMuMu/plugins/ZToLLEdmNtupleDumper.cc

@@ -8,6 +8,7 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/Candidate/interface/CandMatchMap.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
@@ -138,7 +139,7 @@ ZToLLEdmNtupleDumper::ZToLLEdmNtupleDumper( const ParameterSet & cfg ) {
     beta_.push_back(beta);
     relativeIsolation_.push_back(relativeIsolation);
     hltPath_.push_back(hltPath);
-    produces<vector<unsigned int> >( alias = zName + "EventNumber" ).setBranchAlias( alias );
+    produces<vector<edm::EventNumber_t> >( alias = zName + "EventNumber" ).setBranchAlias( alias );
     produces<vector<unsigned int> >( alias = zName + "RunNumber" ).setBranchAlias( alias );
     produces<vector<unsigned int> >( alias = zName + "LumiBlock" ).setBranchAlias( alias );
     produces<vector<float> >( alias = zName + "Mass" ).setBranchAlias( alias );
@@ -230,7 +231,7 @@ void ZToLLEdmNtupleDumper::produce( Event & evt, const EventSetup & ) {
       isMCMatchTrue=true;
     }
     unsigned int zSize = zColl->size();
-    auto_ptr<vector<unsigned int> > event( new vector<unsigned int> );
+    auto_ptr<vector<edm::EventNumber_t> > event( new vector<edm::EventNumber_t> );
     auto_ptr<vector<unsigned int> > run( new vector<unsigned int> );
     auto_ptr<vector<unsigned int> > lumi( new vector<unsigned int > );
     auto_ptr<vector<float> > zMass( new vector<float> );

MuonAnalysis/MomentumScaleCalibration/bin/TreeDump.cc

@@ -33,7 +33,7 @@ lorentzVector fromPtEtaPhiToPxPyPz( const double* ptEtaPhiE )
   return lorentzVector(px,py,pz,E);
 }
 
-int main(int argc, char* argv[]) 
+int main(int argc, char* argv[])
 {
 
   if( argc != 3 ) {
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
   // load framework libraries
   gSystem->Load( "libFWCoreFWLite" );
   AutoLibraryLoader::enable();
-  
+
   // open input file (can be located on castor)
   TFile* inFile = TFile::Open(fileName.c_str());
 
@@ -65,7 +65,7 @@ int main(int argc, char* argv[])
   // Create the RootTreeHandler to save the events in the root tree
   RootTreeHandler treeHandler;
   // treeHandler.readTree(-1, fileName, &pairVector, &genPairVector);
-  std::vector<std::pair<int, int> > evtRun;
+  std::vector<std::pair<unsigned int, unsigned long long> > evtRun;
   treeHandler.readTree(-1, fileName, &pairVector, -20, &evtRun, &genPairVector);
 
   if( (pairVector.size() != genPairVector.size()) && genInfo ) {
@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
 
   MuonPairVector::const_iterator it = pairVector.begin();
   MuonPairVector::const_iterator genIt = genPairVector.begin();
-  std::vector<std::pair<int, int> >::iterator evtRunIt = evtRun.begin();
+  std::vector<std::pair<unsigned int, unsigned long long> >::iterator evtRunIt = evtRun.begin();
   for( ; it != pairVector.end(); ++it, ++genIt, ++evtRunIt ) {
     // Write the information to a txt file
     outputFile << it->first.pt()  << " " << it->first.eta()  << " " << it->first.phi()  << " "
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
     outputFile << " " << evtRunIt->first << " " << evtRunIt->second;
     outputFile << std::endl;
   }
-  
+
   // size_t namePos = fileName.find_last_of("/");
   // treeHandler.writeTree(("tree_"+fileName.substr(namePos+1, fileName.size())).c_str(), &pairVector);
 

MuonAnalysis/MomentumScaleCalibration/interface/Event.h

@@ -1,46 +1,46 @@
 #ifndef MuScleFitEvent_h
 #define MuScleFitEvent_h
- 
+
 #include "TObject.h"
 
 class MuScleFitEvent : public TObject
 {
  public:
-   MuScleFitEvent() : 
-     fRun(0), 
-     fEvent(0), 
+   MuScleFitEvent() :
+     fRun(0),
+     fEvent(0),
      fTrueNumPUvtx(0),
      fTrueNumInteractions(0),
      fNpv(0)
        {}
-     
-     MuScleFitEvent(const unsigned int initRun, const unsigned int initEvent, const int initNPUvtx, const float initTrueNI, const int initNpv) :            
+
+     MuScleFitEvent(const unsigned int initRun, const unsigned long long initEvent, const int initNPUvtx, const float initTrueNI, const int initNpv) :
        fRun(initRun),
        fEvent(initEvent),
        fTrueNumPUvtx(initNPUvtx),
        fTrueNumInteractions(initTrueNI),
-       fNpv(initNpv)          
-       {} 
+       fNpv(initNpv)
+       {}
 
     // Getters
        UInt_t run() const {return fRun;}
-       UInt_t event() const {return fEvent;}
+       ULong64_t event() const {return fEvent;}
        Int_t nPUvtx() const {return fTrueNumPUvtx;}
        Float_t nTrueInteractions() const {return fTrueNumInteractions;}
        UInt_t npv() const {return fNpv;}
 
 
      UInt_t fRun;
-     UInt_t fEvent;
+     ULong64_t fEvent;
      Int_t fTrueNumPUvtx;
      Float_t fTrueNumInteractions;
      UInt_t fNpv;
 
-  
+
   ClassDef(MuScleFitEvent, 1)
     };
 
 ClassImp(MuScleFitEvent)
-  
+
 #endif
 

MuonAnalysis/MomentumScaleCalibration/interface/RootTreeHandler.h

@@ -38,7 +38,7 @@ class RootTreeHandler
     if( genPair != 0 ) {
       tree->Branch("genEvent", "GenMuonPair", &genMuonPair);
       // tree->Branch("genEvent", "MuonPair", &genMuonPair);
-      
+
       if( savedPair->size() != genPair->size() ) {
 	std::cout << "Error: savedPair size ("
 	<< savedPair->size() <<") and genPair size ("
@@ -85,7 +85,7 @@ class RootTreeHandler
   // void readTree( const int maxEvents, const TString & fileName, MuonPairVector * savedPair,
   //           	    const int muonType, MuonPairVector * genPair = 0 )
   void readTree( const int maxEvents, const TString & fileName, MuonPairVector * savedPair,
-		 const int muonType, std::vector<std::pair<int, int>  > * evtRun, MuonPairVector * genPair = 0 )
+		 const int muonType, std::vector<std::pair<unsigned int, unsigned long long>  > * evtRun, MuonPairVector * genPair = 0 )
   {
     TFile * file = TFile::Open(fileName, "READ");
     if( file->IsOpen() ) {

MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsAnalyzer.cc

@@ -182,7 +182,7 @@ void ErrorsAnalyzer::fillHistograms()
 
   typedef std::vector<std::pair<lorentzVector,lorentzVector> > MuonPairVector;
   MuonPairVector savedPair;
-  std::vector<std::pair<int, int> > evtRun;
+  std::vector<std::pair<unsigned int, unsigned long long> > evtRun;
   rootTreeHandler.readTree(maxEvents_, treeFileName_, &savedPair, 0, &evtRun);
   // rootTreeHandler.readTree(maxEvents, inputRootTreeFileName_, &savedPair, &(MuScleFitUtils::genPair));
 

MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsPropagationAnalyzer.cc

@@ -92,7 +92,7 @@ ErrorsPropagationAnalyzer::~ErrorsPropagationAnalyzer()
   drawHistograms(sigmaMassOverMassVsPt_, sigmaMassOverMassVsPtPlusErr_, sigmaMassOverMassVsPtMinusErr_, "sigmaMassOverMassVsPt", "#sigma(M)/M");
 
   sigmaPtVsPtDiff_->Write();
-  sigmaPtVsEtaDiff_->Write();  
+  sigmaPtVsEtaDiff_->Write();
 
   outputFile->Write();
   outputFile->Close();
@@ -290,7 +290,7 @@ void ErrorsPropagationAnalyzer::fillHistograms()
 
   typedef std::vector<std::pair<lorentzVector,lorentzVector> > MuonPairVector;
   MuonPairVector savedPair;
-  std::vector<std::pair<int, int> > evtRun;
+  std::vector<std::pair<unsigned int, unsigned long long> > evtRun;
   rootTreeHandler.readTree(maxEvents_, treeFileName_, &savedPair, 0, &evtRun);
   // rootTreeHandler.readTree(maxEvents, inputRootTreeFileName_, &savedPair, &(MuScleFitUtils::genPair));
 
@@ -345,7 +345,7 @@ void ErrorsPropagationAnalyzer::fillHistograms()
     double sigmaMassMinusErr = massResolution( it->first, it->second, parameters_, sigmaPtMinusErr1, sigmaPtMinusErr2 );
 
     double mass = (it->first + it->second).mass();
-    
+
     if( debug_ ) {
       std::cout << "sigmaPt1 = " << sigmaPt1 << " + " << sigmaPtPlusErr1 << " - " << sigmaPtMinusErr1 << std::endl;
       std::cout << "sigmaPt2 = " << sigmaPt2 << " + " << sigmaPtPlusErr2 << " - " << sigmaPtMinusErr2 << std::endl;