Merge pull request #3 from cms-sw/CMSSW_7_5_X

PRToFixMess_RPCDigitizerForUpgrade75XPR_v3

CommonTools/ParticleFlow/test/Macros/isolation.C

@@ -5,22 +5,28 @@ gSystem->Load("libFWCoreFWLite.so");
 AutoLibraryLoader::enable();
 TFile f("testPFPAT.root");
 
-Events.Draw("recoIsolatedPFCandidates_pfPionsIsolation__PFPAT.obj.isolation_>>h2");
+TTree* Events = 0;
+gDirectory->GetObject("Events", Events);
 
-Events.Draw("recoIsolatedPFCandidates_pfLeptonsPtGt5Isolation__PFPAT.obj.isolation_>>h1","","same");
+Events->Draw("recoIsolatedPFCandidates_pfPionsIsolation__PFPAT.obj.isolation_>>h2");
+Events->Draw("recoIsolatedPFCandidates_pfLeptonsPtGt5Isolation__PFPAT.obj.isolation_>>h1","","same");
 
-h1.SetLineColor(4);
-h1.SetLineWidth(3);
-h1.SetFillStyle(3005);
-h1.SetFillColor(4);
+TH1* h1 = 0;
+gDirectory->GetObject("h1", h1);
+h1->SetLineColor(4);
+h1->SetLineWidth(3);
+h1->SetFillStyle(3005);
+h1->SetFillColor(4);
 
-h2.SetTitle("H to ZZ to 4 mu. Isolation cone 0.2; p_{T} fraction");
-h2.SetStats(0);
-h2.SetLineWidth(3);
+TH1* h2 = 0;
+gDirectory->GetObject("h2", h2);
+h2->SetTitle("H to ZZ to 4 mu. Isolation cone 0.2; p_{T} fraction");
+h2->SetStats(0);
+h2->SetLineWidth(3);
 
 TLegend leg(0.35, 0.6, 0.89,0.89);
-leg.AddEntry(&h1, "Muon PFCandidates","lf");
-leg.AddEntry(&h2, "Pion PFCandidates","lf");
+leg.AddEntry(h1, "Muon PFCandidates","lf");
+leg.AddEntry(h2, "Pion PFCandidates","lf");
 leg.Draw();
 
 gPad->SetLogy();

CommonTools/ParticleFlow/test/Macros/ptJets.C

@@ -5,17 +5,23 @@
   AutoLibraryLoader::enable();
   TFile f("patTuple_PF2PAT.root");
 
-  Events.Draw("patJets_selectedPatJets__PAT.obj.pt()>>h1");
-  Events.Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h2","","same");
+  TTree *Events = 0;
+  gDirectory->GetObject("Events", Events);
+  Events->Draw("patJets_selectedPatJets__PAT.obj.pt()>>h1");
+  Events->Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h2","","same");
 
-  h1.SetStats( false );
-  h1.Draw();
+  TH1* h1 = 0;
+  gDirectory->GetObject("h1", h1);
+  h1->SetStats( false );
+  h1->Draw();
 
-  h2.SetLineColor(4);
-  h2.Draw("same");
+  TH1* h2 = 0;
+  gDirectory->GetObject("h2", h2);
+  h2->SetLineColor(4);
+  h2->Draw("same");
 
   TLegend leg(0.6,0.6,0.8,0.8);
-  leg.AddEntry( &h1, "std PAT");
-  leg.AddEntry( &h2, "PF2PAT+PAT");
+  leg.AddEntry( h1, "std PAT");
+  leg.AddEntry( h2, "PF2PAT+PAT");
   leg.Draw();
 }

CommonTools/ParticleFlow/test/Macros/ptMus.C

@@ -4,18 +4,25 @@
   gSystem->Load("libFWCoreFWLite.so");
   AutoLibraryLoader::enable();
   TFile f("patTuple_PF2PAT.root");
+
+  TTree* Events = 0;
+  gDirectory->GetObject("Events", Events);
 
-  Events.Draw("patMuons_selectedPatMuons__PAT.obj.pt()>>h1");
-  Events.Draw("patMuons_selectedPatMuonsPFlow__PAT.obj.pt()>>h2","","same");
+  Events->Draw("patMuons_selectedPatMuons__PAT.obj.pt()>>h1");
+  Events->Draw("patMuons_selectedPatMuonsPFlow__PAT.obj.pt()>>h2","","same");
 
-  h1.SetStats( false );
-  h1.Draw();
+  TH1* h1 = 0;
+  gDirectory->GetObject("h1", h1);
+  h1->SetStats( false );
+  h1->Draw();
 
-  h2.SetLineColor(4);
-  h2.Draw("same");
+  TH1* h2 = 0;
+  gDirectory->GetObject("h2", h2);
+  h2->SetLineColor(4);
+  h2->Draw("same");
 
   TLegend leg(0.6,0.6,0.8,0.8);
-  leg.AddEntry( &h1, "std PAT");
-  leg.AddEntry( &h2, "PF2PAT+PAT");
+  leg.AddEntry( h1, "std PAT");
+  leg.AddEntry( h2, "PF2PAT+PAT");
   leg.Draw();
 }

CommonTools/ParticleFlow/test/Macros/rootlogon.C

@@ -12,6 +12,12 @@ void loadFWLite() {
   AutoLibraryLoader::enable();
 }
 
+TTree* getEventsrootlogon() {
+  TTree* events = 0;
+  gDirectory->GetObject("Events", events);
+  return events;
+}
+
 void initAOD(const char* process) {
 
   string verticesAod = "recoVertexs_offlinePrimaryVertices__"; 
@@ -26,6 +32,7 @@ void initAOD(const char* process) {
   string pfJetsAod = "recoPFJets_iterativeCone5PFJets__";  
   pfJetsAod += process;
 
+  TTree* Events = getEventsrootlogon();
   Events->SetAlias("verticesAod", verticesAod.c_str()); 
   Events->SetAlias("pfCandidatesAod",  pfCandidatesAod.c_str());
   Events->SetAlias("ic5GenJetsAod",  ic5GenJetsAod.c_str());
@@ -52,6 +59,7 @@ void initPF2PAT(const char* process) {
   string decaysFromZs = "recoGenParticles_decaysFromZs__";
   decaysFromZs += process;
 
+  TTree* Events = getEventsrootlogon();
   Events->SetAlias("met", met.c_str() );
   Events->SetAlias("pileUp", pu.c_str() );
   Events->SetAlias("jetsAll", jetsin.c_str() );
@@ -76,6 +84,7 @@ void initPAT(const char* process) {
 
   string patCaloJets = "patJets_selectedPatJets__"; patCaloJets += process;
 
+  TTree* Events = getEventsrootlogon();
   Events->SetAlias("patTaus", taus.c_str() );
   Events->SetAlias("patJets", jets.c_str() );
   Events->SetAlias("patCaloJets", patCaloJets.c_str() );

CommonTools/ParticleFlow/test/Macros/testMuonTopProjection.C

@@ -9,17 +9,21 @@
   TTree *tEnabled = (TTree*) fEnabled.Get("Events");
 
 
-  tDisabled.Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h1");
-  tEnabled.Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h2","","same");
+  if(tDisabled != 0) tDisabled->Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h1");
+  if(tEnabled != 0) tEnabled->Draw("patJets_selectedPatJetsPFlow__PAT.obj.pt()>>h2","","same");
 
-  h1.SetStats( false );
-  h1.Draw();
+  TH1* h1 = 0;
+  gDirectory->GetObject("h1", h1);
+  h1->SetStats( false );
+  h1->Draw();
 
-  h2.SetLineColor(4);
-  h2.Draw("same");
+  TH1* h2 = 0;
+  gDirectory->GetObject("h2", h2);
+  h2->SetLineColor(4);
+  h2->Draw("same");
 
   TLegend leg(0.6,0.6,0.8,0.8);
-  leg.AddEntry( &h1, "Muon TP disabled");
-  leg.AddEntry( &h2, "Muon TP enabled");
+  leg.AddEntry( h1, "Muon TP disabled");
+  leg.AddEntry( h2, "Muon TP enabled");
   leg.Draw();
 }

CommonTools/RecoAlgos/plugins/PrimaryVertexSorter.h

@@ -167,7 +167,7 @@ void PrimaryVertexSorter<ParticlesCollection>::produce(Event& iEvent,  const Eve
   {
     auto pv = pfToPVVector[i];
     auto qual = pfToPVQualityVector[i];
-    if(pv >=0 and qual > PrimaryVertexAssignment::NotReconstructedPrimary){
+    if(pv >=0 and qual >= qualityCut_){
        pvToPFVector[pv].push_back(i);
 //    std::cout << i << std::endl;
 //     const typename  ParticlesCollection::value_type & cp = particles[i];

CommonTools/RecoAlgos/python/sortedPFPrimaryVertices_cfi.py

@@ -20,7 +20,7 @@
   particles = cms.InputTag("particleFlow"),
   vertices= cms.InputTag("offlinePrimaryVertices"),
   jets= cms.InputTag("ak4PFJets"),
-  qualityForPrimary = cms.int32(2),
+  qualityForPrimary = cms.int32(3),
   usePVMET = cms.bool(True),
   produceAssociationToOriginalVertices = cms.bool(True),
   produceSortedVertices = cms.bool(True),

CommonTools/RecoAlgos/python/sortedPrimaryVertices_cfi.py

@@ -21,7 +21,7 @@
   vertices= cms.InputTag("offlinePrimaryVertices"),
 #  Jets= cms.InputTag("ak4PFJets"),
   jets= cms.InputTag("ak4CaloJetsForTrk"),
-  qualityForPrimary = cms.int32(2),
+  qualityForPrimary = cms.int32(3),
   usePVMET = cms.bool(True),
   produceAssociationToOriginalVertices=  cms.bool(False),
   produceSortedVertices = cms.bool(True),

CommonTools/RecoAlgos/src/PrimaryVertexAssignment.cc

@@ -92,7 +92,7 @@ PrimaryVertexAssignment::chargedHadronVertex( const reco::VertexCollection& vert
 
   // if the track is not compatible with other PVs but is compatible with the BeamSpot, we may simply have not reco'ed the PV!
   //  we still point it to the closest in Z, but flag it as possible orphan-primary
-  if(track->dxy(vertices[0].position())<maxDxyForNotReconstructedPrimary_ && track->dxy(vertices[0].position())/track->dxyError()<maxDxySigForNotReconstructedPrimary_)
+  if(std::abs(track->dxy(vertices[0].position()))<maxDxyForNotReconstructedPrimary_ && std::abs(track->dxy(vertices[0].position())/track->dxyError())<maxDxySigForNotReconstructedPrimary_)
      return std::pair<int,PrimaryVertexAssignment::Quality>(vtxIdMinDz,PrimaryVertexAssignment::NotReconstructedPrimary);
 
   //FIXME: here we could better handle V0s and NucInt

Configuration/EventContent/python/AlCaRecoOutput_cff.py

@@ -36,8 +36,6 @@
 ###############################################################
 # ECAL Calibration
 ###############################################################
-# ECAL calibration with phi symmetry 
-from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_Output_cff import *
 # ECAL calibration with isol. electrons
 from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalIsolElectron_Output_cff import *
 # The following paths are obsoleted since pi0 calibration

Configuration/EventContent/python/EventContent_cff.py

@@ -675,7 +675,6 @@
 ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlBeamHalo_noDrop.outputCommands)
 ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalZeroBias_noDrop.outputCommands)
 ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripCalMinBias_noDrop.outputCommands)
-ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalPhiSym_noDrop.outputCommands)
 ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalElectron_noDrop.outputCommands)
 ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalPi0Calib_noDrop.outputCommands)
 ALCARECOEventContent.outputCommands.extend(OutALCARECOEcalCalEtaCalib_noDrop.outputCommands)

Configuration/StandardSequences/python/AlCaRecoStream_SpecialsHI_cff.py

@@ -46,27 +46,6 @@
         dataTier = cms.untracked.string('ALCARECO')
         )
 
-
-# ECAL calibration with phi symmetry 
-from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_cff import *
-
-from DQMOffline.Configuration.AlCaRecoDQMHI_cff import *
-
-#pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym*ALCARECOEcalCalPhisymDQM)
-pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym)
-
-from Configuration.EventContent.AlCaRecoOutput_cff import *
-
-ALCARECOStreamEcalCalPhiSym = cms.FilteredStream(
-        responsible = 'Stefano Argiro',
-        name = 'ALCARECOEcalCalPhiSym',
-        paths  = (pathALCARECOEcalCalPhiSym),
-        content = OutALCARECOEcalCalPhiSym.outputCommands,
-        selectEvents = OutALCARECOEcalCalPhiSym.SelectEvents,
-        dataTier = cms.untracked.string('ALCARECO')
-        )
-
-
 # HCAL calibration with min.bias
 from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBiasHI_cff import *
 

Configuration/StandardSequences/python/AlCaRecoStream_Specials_cff.py

@@ -42,28 +42,6 @@
         dataTier = cms.untracked.string('ALCARECO')
         )
 
-
-# ECAL calibration with phi symmetry 
-from Calibration.EcalAlCaRecoProducers.ALCARECOEcalCalPhiSym_cff import *
-
-from DQMOffline.Configuration.AlCaRecoDQM_cff import *
-
-#pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym*ALCARECOEcalCalPhisymDQM)
-pathALCARECOEcalCalPhiSym = cms.Path(seqALCARECOEcalCalPhiSym)
-
-from Configuration.EventContent.AlCaRecoOutput_cff import *
-
-ALCARECOStreamEcalCalPhiSym = cms.FilteredStream(
-        responsible = 'Stefano Argiro',
-        name = 'ALCARECOEcalCalPhiSym',
-        paths  = (pathALCARECOEcalCalPhiSym),
-        content = OutALCARECOEcalCalPhiSym.outputCommands,
-        selectEvents = OutALCARECOEcalCalPhiSym.SelectEvents,
-        dataTier = cms.untracked.string('ALCARECO')
-        )
-
-
-
 # HCAL calibration with min.bias
 from Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalMinBias_cff import *
 

Configuration/StandardSequences/python/Mixing.py

@@ -151,6 +151,8 @@ def addMixingScenario(label,dict):
 addMixingScenario("Flat_20_50_50ns",{'file': 'SimGeneral.MixingModule.mix_Flat_20_50_50ns_cfi'})
 addMixingScenario("Flat_0_50_25ns",{'file': 'SimGeneral.MixingModule.mix_Flat_0_50_25ns_cfi'})
 addMixingScenario("Flat_0_50_50ns",{'file': 'SimGeneral.MixingModule.mix_Flat_0_50_50ns_cfi'})
+addMixingScenario("Flat_10_50_25ns",{'file': 'SimGeneral.MixingModule.mix_Flat_10_50_25ns_cfi'})
+addMixingScenario("Flat_10_50_50ns",{'file': 'SimGeneral.MixingModule.mix_Flat_10_50_50ns_cfi'})
 
 MixingDefaultKey = '2012_Summer_50ns_PoissonOOTPU'
 

DQMServices/Components/test/driver3a.sh

@@ -7,7 +7,7 @@ numev=3
 step=a
 DQMSEQUENCE=DQM
 
-cmsDriver.py SingleMuPt10.cfi -s GEN,SIM,DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake -n ${numev} --eventcontent FEVTDEBUGHLT --datatier FEVTDEBUGHLT --conditions auto:startup_GRun --mc --no_exec --python_filename=test_${tnum}_${step}_1.py
+cmsDriver.py SingleMuPt10.cfi -s GEN,SIM,DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake -n ${numev} --eventcontent FEVTDEBUGHLT --datatier FEVTDEBUGHLT --conditions auto:run1_mc --mc --no_exec --python_filename=test_${tnum}_${step}_1.py
 
 cmsRun -e test_${tnum}_${step}_1.py >& p3.0.log
 
@@ -18,34 +18,34 @@ fi
 mv FrameworkJobReport{,_3_${step}_1}.xml
 
 
-#cmsDriver.py step2_MC1_1 -s RAW2DIGI,RECO,VALIDATION:validation_preprod -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier FEVTDEBUGHLT,DQMIO --conditions auto:mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.1.log 
+#cmsDriver.py step2_MC1_1 -s RAW2DIGI,RECO,VALIDATION:validation_preprod -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier FEVTDEBUGHLT,DQMIO --conditions auto:run1_mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.1.log 
 
 #if [ $? -ne 0 ]; then
 #	return 1
 #fi
 
-#cmsDriver.py step2_MC1_2 -s RAW2DIGI,RECO,${DQMSEQUENCE} -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.2.log 
+#cmsDriver.py step2_MC1_2 -s RAW2DIGI,RECO,${DQMSEQUENCE} -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:run1_mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.2.log 
 
 #if [ $? -ne 0 ]; then
 #	return 1
 #fi
 
-#cmsDriver.py step2_MC1_3 -s RAW2DIGI,RECO,VALIDATION:validation_preprod,${DQMSEQUENCE} -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.3.log 
+#cmsDriver.py step2_MC1_3 -s RAW2DIGI,RECO,VALIDATION:validation_preprod,${DQMSEQUENCE} -n 3 --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:run1_mc --mc --customise DQMServices/Components/test/customRecoSim.py >& p3.3.log 
 
 #if [ $? -ne 0 ]; then
 #	return 1
 #fi
 
 #run first time
-cmsDriver.py step2_MC1_4 -s RAW2DIGI,L1Reco,RECO,VALIDATION,${DQMSEQUENCE} -n ${numev} --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:mc --mc --customise DQMServices/Components/test/customRecoSim.py --no_exec  --python_filename=test_${tnum}_${step}_2.py
+cmsDriver.py step2_MC1_4 -s RAW2DIGI,L1Reco,RECO,VALIDATION,${DQMSEQUENCE} -n ${numev} --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:run1_mc --mc --customise DQMServices/Components/test/customRecoSim.py --no_exec  --python_filename=test_${tnum}_${step}_2.py
 
 cmsRun -e test_${tnum}_${step}_2.py >& p3.4.log
 if [ $? -ne 0 ]; then
   return 1
 fi
 
 #run second time
-cmsDriver.py step2_MC1_4 -s RAW2DIGI,L1Reco,RECO,VALIDATION,${DQMSEQUENCE} -n ${numev} --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:mc --mc --customise DQMServices/Components/test/customRecoSim.py --no_exec  --python_filename=test_${tnum}_${step}_2ndPass_2.py --fileout=secondPass.root
+cmsDriver.py step2_MC1_4 -s RAW2DIGI,L1Reco,RECO,VALIDATION,${DQMSEQUENCE} -n ${numev} --filein file:SingleMuPt10_cfi_GEN_SIM_DIGI_L1_DIGI2RAW_HLT.root --eventcontent RECOSIM,DQM --datatier RECOSIM,DQMIO --conditions auto:run1_mc --mc --customise DQMServices/Components/test/customRecoSim.py --no_exec  --python_filename=test_${tnum}_${step}_2ndPass_2.py --fileout=secondPass.root
 
 cmsRun -e test_${tnum}_${step}_2ndPass_2.py >& p3.4.2ndPass.log
 if [ $? -ne 0 ]; then

DQMServices/Components/test/driver3b.sh

@@ -24,7 +24,7 @@ DQMSEQUENCE=HARVESTING:validationHarvesting+dqmHarvesting
 #fi
 
 #python /afs/cern.ch/user/r/rovere/public/checkMem.py cmsDriver.py step3_MC1_4 -s ${DQMSEQUENCE} --harvesting AtRunEnd --conditions auto:mc --filetype DQM --filein file:step2_MC1_4_RAW2DIGI_RECO_VALIDATION_DQM_inDQM.root --mc --customise DQMServices/Components/test/customHarvesting.py >& q3.4.log && mv DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO.root DQM_V0001_R000000001__Global__CMSSW_X_Y_Z__RECO_4.root
-cmsDriver.py step3_MC1_4 -s ${DQMSEQUENCE} --harvesting AtRunEnd --conditions auto:mc --filetype DQM --filein file:step2_MC1_4_RAW2DIGI_L1Reco_RECO_VALIDATION_DQM_inDQM.root --mc --customise DQMServices/Components/test/customHarvesting.py --python_filename=test_${tnum}_b_1.py  --no_exec
+cmsDriver.py step3_MC1_4 -s ${DQMSEQUENCE} --harvesting AtRunEnd --conditions auto:run1_mc --filetype DQM --filein file:step2_MC1_4_RAW2DIGI_L1Reco_RECO_VALIDATION_DQM_inDQM.root --mc --customise DQMServices/Components/test/customHarvesting.py --python_filename=test_${tnum}_b_1.py  --no_exec
 
 cmsRun -e test_${tnum}_b_1.py >& q3.4.log