CMSSW_6_2_X_2013-04-08-0200

DQMOffline/Muon/.admin/developers

@@ -44,6 +44,7 @@ deisher: Amanda Deisher : [email protected]
 folguera: Santiago Folgueras : [email protected]
 
 >Administrators
+deguio: Federico De Guio : [email protected]
 bellan : Riccardo Bellan : [email protected]
 namapane : Nicola Amapane : [email protected]
 goys : Silvia Goy Lopez : [email protected]

DQMOffline/Muon/src/EfficiencyPlotter.cc

@@ -81,6 +81,15 @@ void EfficiencyPlotter::beginJob(void){
   h_eff_vtx_EE_detIsoTightMu = theDbe->book1D("Eff_vtx_EE_detIsoTightMu", "Endcap: detIsoTightMu Eff. vs nVtx", vtxBin, vtxMin, vtxMax);
   h_eff_vtx_EE_pfIsoTightMu  = theDbe->book1D("Eff_vtx_EE_pfIsoTightMu",  "Endcap: pfIsoTightMu Eff. vs nVtx",  vtxBin, vtxMin, vtxMax);
 
+  h_eff_pt_pfIsodBTightMu      = theDbe->book1D("Eff_pt_pfIsodBTightMu",      "pfIsoTightMu (deltaBeta) Eff. vs Pt",            ptBin, ptMin, ptMax);
+  h_eff_pt_EB_pfIsodBTightMu   = theDbe->book1D("Eff_pt_EB_pfIsodBTightMu",   "Barrel: pfIsoTightMu (deltaBeta) Eff. vs Pt",    ptBin, ptMin, ptMax);
+  h_eff_pt_EE_pfIsodBTightMu   = theDbe->book1D("Eff_pt_EE_pfIsodBTightMu",   "Endcap: pfIsoTightMu (deltaBeta) Eff. vs Pt",    ptBin, ptMin, ptMax);
+  h_eff_vtx_pfIsodBTightMu     = theDbe->book1D("Eff_vtx_pfIsodBTightMu",     "pfIsoTightMu (deltaBeta) Eff. vs nVtx",          vtxBin, vtxMin, vtxMax);
+  h_eff_vtx_EB_pfIsodBTightMu  = theDbe->book1D("Eff_vtx_EB_pfIsodBTightMu",  "Barrel: pfIsoTightMu (deltaBeta) Eff. vs nVtx",  vtxBin, vtxMin, vtxMax);
+  h_eff_vtx_EE_pfIsodBTightMu  = theDbe->book1D("Eff_vtx_EE_pfIsodBTightMu",  "Endcap: pfIsoTightMu (deltaBeta) Eff. vs nVtx",  vtxBin, vtxMin, vtxMax);
+
+
+
   // This prevents this ME to be normalized when drawn into the GUI
   h_eff_eta_TightMu         ->setEfficiencyFlag();
   h_eff_hp_eta_TightMu      ->setEfficiencyFlag();
@@ -101,6 +110,15 @@ void EfficiencyPlotter::beginJob(void){
   h_eff_vtx_EE_detIsoTightMu->setEfficiencyFlag();
   h_eff_vtx_EE_pfIsoTightMu ->setEfficiencyFlag();
 
+  h_eff_pt_pfIsodBTightMu   ->setEfficiencyFlag();
+  h_eff_pt_EB_pfIsodBTightMu ->setEfficiencyFlag();
+  h_eff_pt_EE_pfIsodBTightMu ->setEfficiencyFlag();
+  h_eff_vtx_pfIsodBTightMu   ->setEfficiencyFlag();
+  h_eff_vtx_EB_pfIsodBTightMu ->setEfficiencyFlag();
+  h_eff_vtx_EE_pfIsodBTightMu ->setEfficiencyFlag();
+
+
+
   // AXIS TITLES....
   h_eff_hp_eta_TightMu      ->setAxisTitle("#eta",         1);  
   h_eff_eta_TightMu         ->setAxisTitle("#eta",         1);  
@@ -120,6 +138,14 @@ void EfficiencyPlotter::beginJob(void){
   h_eff_vtx_EB_pfIsoTightMu ->setAxisTitle("Number of PV", 1);
   h_eff_vtx_EE_detIsoTightMu->setAxisTitle("Number of PV", 1);
   h_eff_vtx_EE_pfIsoTightMu ->setAxisTitle("Number of PV", 1);
+
+  h_eff_pt_pfIsodBTightMu     ->setAxisTitle("p_{T} (GeV)",  1); 
+  h_eff_pt_EB_pfIsodBTightMu  ->setAxisTitle("p_{T} (GeV)",  1);  
+  h_eff_pt_EE_pfIsodBTightMu  ->setAxisTitle("p_{T} (GeV)",  1);   
+  h_eff_vtx_pfIsodBTightMu    ->setAxisTitle("Number of PV", 1);
+  h_eff_vtx_EB_pfIsodBTightMu ->setAxisTitle("Number of PV", 1);
+  h_eff_vtx_EE_pfIsodBTightMu ->setAxisTitle("Number of PV", 1);
+
 
 //   h_eff_eta_TightMu         ->setAxisTitle("Tight Mu Eff.",      2);  
 //   h_eff_hp_eta_TightMu      ->setAxisTitle("High p_{T} Mu Eff.", 2);  
@@ -521,6 +547,129 @@ void EfficiencyPlotter::endRun(Run const& run, EventSetup const& eSetup) {
 
 
 
+ /// --- Tight Muon + PF IsodBlation corrected by deltaBeta  efficiency vs muon Pt
+  string numpath_pfIsodB_pt = "Muons/EfficiencyAnalyzer/passProbes_pfIsodBTightMu_pt";
+  string denpath_pfIsodB_pt = "Muons/EfficiencyAnalyzer/allProbes_TightMu_pt";
+
+  MonitorElement *Numerator_pfIsodB_pt   = theDbe->get(numpath_pfIsodB_pt);
+  MonitorElement *Denominator_pfIsodB_pt = theDbe->get(denpath_pfIsodB_pt);
+
+  if (Numerator_pfIsodB_pt && Denominator_pfIsodB_pt){
+
+    TH1F *h_numerator_pfIsodB_pt   = Numerator_pfIsodB_pt->getTH1F();
+    TH1F *h_denominator_pfIsodB_pt = Denominator_pfIsodB_pt->getTH1F();
+
+    TH1F *h_eff_pfIsodB_pt = h_eff_pt_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_pt->GetSumw2N() == 0) h_eff_pfIsodB_pt->Sumw2();  
+
+    h_eff_pfIsodB_pt->Divide(h_numerator_pfIsodB_pt, h_denominator_pfIsodB_pt, 1., 1., "B");
+  }
+
+
+  /// --- Tight Muon + PF IsodBlation corrected by deltaBeta   efficiency vs muon Pt [EB] 
+
+  string numpath_pfIsodB_EB_pt = "Muons/EfficiencyAnalyzer/passProbes_EB_pfIsodBTightMu_pt";
+  string denpath_pfIsodB_EB_pt = "Muons/EfficiencyAnalyzer/allProbes_EB_TightMu_pt";
+
+  MonitorElement *Numerator_pfIsodB_EB_pt   = theDbe->get(numpath_pfIsodB_EB_pt);
+  MonitorElement *Denominator_pfIsodB_EB_pt = theDbe->get(denpath_pfIsodB_EB_pt);
+
+  if (Numerator_pfIsodB_EB_pt && Denominator_pfIsodB_EB_pt){
+
+    TH1F *h_numerator_pfIsodB_EB_pt   = Numerator_pfIsodB_EB_pt->getTH1F();
+    TH1F *h_denominator_pfIsodB_EB_pt = Denominator_pfIsodB_EB_pt->getTH1F();
+
+    TH1F *h_eff_pfIsodB_EB_pt = h_eff_pt_EB_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_EB_pt->GetSumw2N() == 0) h_eff_pfIsodB_EB_pt->Sumw2();  
+    h_eff_pfIsodB_EB_pt->Divide(h_numerator_pfIsodB_EB_pt, h_denominator_pfIsodB_EB_pt, 1., 1., "B");
+
+  }
+
+
+  /// --- Tight Muon + PF IsodBlation corrected by deltaBeta  efficiency vs muon Pt [EE] 
+  string numpath_pfIsodB_EE_pt = "Muons/EfficiencyAnalyzer/passProbes_EE_pfIsodBTightMu_pt";
+  string denpath_pfIsodB_EE_pt = "Muons/EfficiencyAnalyzer/allProbes_EE_TightMu_pt";
+
+  MonitorElement *Numerator_pfIsodB_EE_pt   = theDbe->get(numpath_pfIsodB_EE_pt);
+  MonitorElement *Denominator_pfIsodB_EE_pt = theDbe->get(denpath_pfIsodB_EE_pt);
+
+  if (Numerator_pfIsodB_EE_pt && Denominator_pfIsodB_EE_pt){
+
+    TH1F *h_numerator_pfIsodB_EE_pt   = Numerator_pfIsodB_EE_pt->getTH1F();
+    TH1F *h_denominator_pfIsodB_EE_pt = Denominator_pfIsodB_EE_pt->getTH1F();
+
+    TH1F *h_eff_pfIsodB_EE_pt = h_eff_pt_EE_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_EE_pt->GetSumw2N() == 0) h_eff_pfIsodB_EE_pt->Sumw2();  
+
+    h_eff_pfIsodB_EE_pt->Divide(h_numerator_pfIsodB_EE_pt, h_denominator_pfIsodB_EE_pt, 1., 1., "B");
+
+  }
+
+
+ /// --- Tight Muon + PF Isolation corrected by deltaBeta efficiency vs muon number of reco Vertex
+
+  string numpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/passProbes_pfIsodBTightMu_nVtx";
+  string denpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/allProbes_TightMu_nVtx";
+
+  MonitorElement *Numerator_pfIsodB_nvtx   = theDbe->get(numpath_pfIsodB_nvtx);
+  MonitorElement *Denominator_pfIsodB_nvtx = theDbe->get(denpath_pfIsodB_nvtx);
+
+  if (Numerator_pfIsodB_nvtx && Denominator_pfIsodB_nvtx){
+
+    TH1F *h_numerator_pfIsodB_nvtx   = Numerator_pfIsodB_nvtx->getTH1F();
+    TH1F *h_denominator_pfIsodB_nvtx = Denominator_pfIsodB_nvtx->getTH1F();
+
+    TH1F *h_eff_pfIsodB_nvtx = h_eff_vtx_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_nvtx->GetSumw2N() == 0) h_eff_pfIsodB_nvtx->Sumw2();  
+
+    h_eff_pfIsodB_nvtx->Divide(h_numerator_pfIsodB_nvtx, h_denominator_pfIsodB_nvtx, 1., 1., "B");
+
+  }
+
+
+  /// --- Tight Muon + PF-Based Isolation corrected by deltaBeta efficiency vs muon number of reco Vertex [EB]
+  numpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/passProbes_EB_pfIsodBTightMu_nVtx";
+  denpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/allProbes_EB_TightMu_nVtx";
+
+  Numerator_pfIsodB_nvtx   = theDbe->get(numpath_pfIsodB_nvtx);
+  Denominator_pfIsodB_nvtx = theDbe->get(denpath_pfIsodB_nvtx);
+
+  if (Numerator_pfIsodB_nvtx && Denominator_pfIsodB_nvtx){
+
+    TH1F *h_numerator_pfIsodB_nvtx   = Numerator_pfIsodB_nvtx->getTH1F();
+    TH1F *h_denominator_pfIsodB_nvtx = Denominator_pfIsodB_nvtx->getTH1F();
+
+    TH1F *h_eff_pfIsodB_nvtx = h_eff_vtx_EB_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_nvtx->GetSumw2N() == 0) h_eff_pfIsodB_nvtx->Sumw2();  
+
+    h_eff_pfIsodB_nvtx->Divide(h_numerator_pfIsodB_nvtx, h_denominator_pfIsodB_nvtx, 1., 1., "B");
+  }
+
+
+  /// --- Tight Muon + PF-Based Isolation corrected by deltaBeta efficiency vs muon number of reco Vertex [EE]     
+  numpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/passProbes_EE_pfIsodBTightMu_nVtx";
+  denpath_pfIsodB_nvtx = "Muons/EfficiencyAnalyzer/allProbes_EE_TightMu_nVtx";
+
+  Numerator_pfIsodB_nvtx   = theDbe->get(numpath_pfIsodB_nvtx);
+  Denominator_pfIsodB_nvtx = theDbe->get(denpath_pfIsodB_nvtx);
+
+  if (Numerator_pfIsodB_nvtx && Denominator_pfIsodB_nvtx){
+
+    TH1F *h_numerator_pfIsodB_nvtx   = Numerator_pfIsodB_nvtx->getTH1F();
+    TH1F *h_denominator_pfIsodB_nvtx = Denominator_pfIsodB_nvtx->getTH1F();
+
+    TH1F *h_eff_pfIsodB_nvtx = h_eff_vtx_EE_pfIsodBTightMu->getTH1F();
+
+    if (h_eff_pfIsodB_nvtx->GetSumw2N() == 0) h_eff_pfIsodB_nvtx->Sumw2();  
+
+    h_eff_pfIsodB_nvtx->Divide(h_numerator_pfIsodB_nvtx, h_denominator_pfIsodB_nvtx, 1., 1., "B");
+
+  }
 
 
 }

DQMOffline/Muon/src/EfficiencyPlotter.h

@@ -103,6 +103,13 @@ class EfficiencyPlotter: public edm::EDAnalyzer{
   MonitorElement* h_eff_vtx_EB_pfIsoTightMu;
   MonitorElement* h_eff_vtx_EE_pfIsoTightMu;
 
+  MonitorElement* h_eff_pt_pfIsodBTightMu;
+  MonitorElement* h_eff_pt_EB_pfIsodBTightMu;
+  MonitorElement* h_eff_pt_EE_pfIsodBTightMu;
+
+  MonitorElement* h_eff_vtx_pfIsodBTightMu;
+  MonitorElement* h_eff_vtx_EB_pfIsodBTightMu;
+  MonitorElement* h_eff_vtx_EE_pfIsodBTightMu;
 
 };
 

EventFilter/Processor/ChangeLog

@@ -1,3 +1,8 @@
+2013-04-07 Emilio Meschi <[email protected]>
+
+	* tag V02-05-29
+	* minor fix for compilation in 62X
+
 2012-11-04 Srecko Morovic <[email protected]>
 
 	* tag V02-05-26

EventFilter/Processor/src/FUEventProcessor.cc

@@ -903,7 +903,11 @@ void FUEventProcessor::subWeb(xgi::Input  *in, xgi::Output *out) throw (xgi::exc
 	if(nbytes < MAX_PIPE_BUFFER_SIZE) done = true; // this will break the while loop
 	char *buf= new char[nbytes];
 	ssize_t retval = read(anonymousPipe_[PIPE_READ],buf,nbytes);
-	if(retval!=nbytes) std::cout 
+	if(retval<0){
+	  std::cout << "Failed to read from pipe." << std::endl;
+	  continue;
+	}
+	if(static_cast<unsigned int>(retval) != nbytes) std::cout 
 	  << "CAREFUL HERE, read less bytes than expected from pipe in subWeb" << std::endl;
 	pieces.push_back(buf);
       }
@@ -2676,7 +2680,7 @@ void FUEventProcessor::makeStaticInfo()
   using namespace utils;
   std::ostringstream ost;
   mDiv(&ost,"ve");
-  ost<< "$Revision: 1.163 $ (" << edm::getReleaseVersion() <<")";
+  ost<< "$Revision: 1.164 $ (" << edm::getReleaseVersion() <<")";
   cDiv(&ost);
   mDiv(&ost,"ou",outPut_.toString());
   mDiv(&ost,"sh",hasShMem_.toString());

EventFilter/Utilities/ChangeLog

@@ -1,3 +1,8 @@
+2013-03-07 Emilio Meschi <[email protected]>
+
+	* tag V02-19-39
+	* minimal fixes for 62X
+
 2012-09-02 Srecko Morovic <[email protected]>
 
 	* tag V02-19-37

EventFilter/Utilities/plugins/ExceptionGenerator.cc

@@ -34,7 +34,7 @@ namespace evf{
     ExceptionGenerator::ExceptionGenerator( const edm::ParameterSet& pset) : 
       ModuleWeb("ExceptionGenerator"), 
       actionId_(pset.getUntrackedParameter<int>("defaultAction",-1)),
-      intqualifier_(pset.getUntrackedParameter<int>("defaultQualifier",0)), 
+      intqualifier_(pset.getUntrackedParameter<unsigned int>("defaultQualifier",0)), 
       actionRequired_(actionId_!=-1)
     {
 
@@ -228,7 +228,7 @@ namespace evf{
 	      {
 		timeval tv_now;
 	        gettimeofday(&tv_now,0);
-		if (tv_now.tv_sec-tv_start_.tv_sec>intqualifier_)
+		if (static_cast<unsigned long>(tv_now.tv_sec-tv_start_.tv_sec) > intqualifier_)
 		  *pi=0;
 	      }
 	      break;

EventFilter/Utilities/python/ExceptionGenerator_cfi.py

@@ -2,7 +2,7 @@
 
 ExceptionGenerator = cms.EDAnalyzer( "ExceptionGenerator",
              defaultAction       = cms.untracked.int32(-1),
-             defaultQualifier    = cms.untracked.int32(0)
+             defaultQualifier    = cms.untracked.uint32(0)
 )
 
 

FastSimulation/Configuration/python/Validation_cff.py

@@ -14,6 +14,19 @@
     mergedtruthMuon.simHitLabel = cms.string('g4SimHits')
     mergedtruthMuon.simHitCollections = cms.PSet(tracker = cms.vstring("g4SimHitsTrackerHits"))
     TrackAssociatorByHits.ROUList = ['g4SimHitsTrackerHits']
+    # reactivate crossing frame, but only if validation is executed:
+    from FastSimulation.Configuration.mixHitsWithPU_cfi import *
+    mixSimCaloHits.mixObjects.mixSH.crossingFrames = cms.untracked.vstring('MuonCSCHits',
+                                                                'MuonDTHits',
+                                                                'MuonRPCHits',
+                                                                'TrackerHits')
+    mixSimCaloHits.mixObjects.mixCH.crossingFrames = cms.untracked.vstring('EcalHitsEB',
+                                                       'EcalHitsEE',
+                                                       'EcalHitsES',
+                                                       'HcalHits')
+    mixSimCaloHits.mixObjects.mixTracks.makeCrossingFrame = cms.untracked.bool(True)
+    mixSimCaloHits.mixObjects.mixMuonTracks.makeCrossingFrame = cms.untracked.bool(True)
+    mixSimCaloHits.mixObjects.mixVertices.makeCrossingFrame = cms.untracked.bool(True)
 else:
     mergedtruth.mixLabel = cms.string('mix')
     mergedtruth.simHitLabel = cms.string('famosSimHits')

FastSimulation/Configuration/python/mixFastSimObjects_cfi.py

@@ -12,8 +12,8 @@
                               'TrackerHits'),
         crossingFrames = cms.untracked.vstring('MuonCSCHits', 
                                                'MuonDTHits', 
-                                               'MuonRPCHits', 
-                                               'TrackerHits')
+                                               'MuonRPCHits')#, 
+                                               #'TrackerHits')
         )
     mixCaloHits = cms.PSet(
         input = cms.VInputTag(cms.InputTag("g4SimHits","EcalHitsEB"), cms.InputTag("g4SimHits","EcalHitsEE"), cms.InputTag("g4SimHits","EcalHitsES"), cms.InputTag("g4SimHits","HcalHits")),
@@ -22,24 +22,24 @@
                               'EcalHitsEE', 
                               'EcalHitsES', 
                               'HcalHits'),
-        crossingFrames = cms.untracked.vstring('EcalHitsEB', 
-                                               'EcalHitsEE', 
-                                               'EcalHitsES', # keep only ES and remove the others?
-                                               'HcalHits')
+        crossingFrames = cms.untracked.vstring(#'EcalHitsEB', 
+                                               #'EcalHitsEE', 
+                                               'EcalHitsES')#, # keep only ES and remove the others?
+                                               #'HcalHits')
         )
     mixSimTracks = cms.PSet(
         input = cms.VInputTag(cms.InputTag("g4SimHits")),
-        makeCrossingFrame = cms.untracked.bool(True),
+        makeCrossingFrame = cms.untracked.bool(False),
         type = cms.string('SimTrack')
         )
     mixMuonSimTracks = cms.PSet(
         input = cms.VInputTag(cms.InputTag("g4SimHits","MuonSimTracks")),
-        makeCrossingFrame = cms.untracked.bool(True),
+        makeCrossingFrame = cms.untracked.bool(False),
         type = cms.string('SimTrack')
         )
     mixSimVertices = cms.PSet(
         input = cms.VInputTag(cms.InputTag("g4SimHits")),
-        makeCrossingFrame = cms.untracked.bool(True),
+        makeCrossingFrame = cms.untracked.bool(False),
         type = cms.string('SimVertex')
         )
 else:

HLTrigger/Timer/test/BuildFile.xml

@@ -7,7 +7,7 @@
   <use   name="root"/>
 </bin>
 
-<bin name="testTimer" file="timer.cc">
+<bin name="testChrono" file="chrono.cc mach_absolute_time.cc mach_clock_get_time.cc posix_clock_gettime.cc tbb_tick_count.cc x86_tsc.cc">
   <use   name="boost"/>
   <use   name="tbb"/>
   <use   name="sockets"/>       <!-- imply -lrt on Linux -->