diff --git a/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc index 80407e61aa011..f8762706ade7e 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc +++ b/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc @@ -1,12 +1,11 @@ #include "Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h" -//#include "DataFormats/EgammaCandidates/interface/GsfElectron.h" #include "DataFormats/EgammaCandidates/interface/Photon.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/MakerMacros.h" //#define ALLrecHits //#define DEBUG diff --git a/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h b/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h index 948fae91975a3..7ebc3c185cd07 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h +++ b/Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h @@ -29,7 +29,6 @@ #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -37,7 +36,7 @@ #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h" diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc index adb3cb3b8df33..509c6e4ac298e 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc +++ b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc @@ -43,7 +43,7 @@ #include "DataFormats/CaloRecHit/interface/CaloRecHit.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/EcalMapping/interface/EcalMappingRcd.h" #include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/Calibration/EcalCalibAlgos/interface/ElectronCalibrationUniv.h b/Calibration/EcalCalibAlgos/interface/ElectronCalibrationUniv.h index b3cfa061a76f6..d5d2d4d9d215c 100644 --- a/Calibration/EcalCalibAlgos/interface/ElectronCalibrationUniv.h +++ b/Calibration/EcalCalibAlgos/interface/ElectronCalibrationUniv.h @@ -30,7 +30,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc index 70629da540145..54aa336844348 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc @@ -44,7 +44,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc b/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc index 498b11da3fc04..1bf027d6c1cfc 100644 --- a/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc +++ b/Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc @@ -61,7 +61,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc b/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc index 0c8d0eb68d7b1..28cc1e077cc72 100644 --- a/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc +++ b/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc @@ -58,7 +58,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonHighEtaAnalyzer.cc b/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonHighEtaAnalyzer.cc index a70a57942fc1e..188436e9c171f 100644 --- a/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonHighEtaAnalyzer.cc +++ b/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonHighEtaAnalyzer.cc @@ -62,7 +62,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc b/Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc index bc32ef3278ee6..05120f8968cab 100644 --- a/Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc +++ b/Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc @@ -77,7 +77,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc index 5a768d1a3d613..6ad8751df9364 100644 --- a/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc +++ b/Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc @@ -42,7 +42,7 @@ See the twiki page for details: #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "CondFormats/HcalObjects/interface/HcalRespCorrs.h" diff --git a/Calibration/HcalCalibAlgos/test/HcalIsoTrackStudy.cc b/Calibration/HcalCalibAlgos/test/HcalIsoTrackStudy.cc index 4a99a8f88e8a0..e72f8ca094a18 100644 --- a/Calibration/HcalCalibAlgos/test/HcalIsoTrackStudy.cc +++ b/Calibration/HcalCalibAlgos/test/HcalIsoTrackStudy.cc @@ -64,7 +64,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/ElectronStudy.cc b/Calibration/IsolatedParticles/plugins/ElectronStudy.cc index 68e7dc1eb94b2..2f64fe48b7ba0 100644 --- a/Calibration/IsolatedParticles/plugins/ElectronStudy.cc +++ b/Calibration/IsolatedParticles/plugins/ElectronStudy.cc @@ -15,7 +15,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/Calibration/IsolatedParticles/plugins/HcalHBHEMuonSimAnalyzer.cc b/Calibration/IsolatedParticles/plugins/HcalHBHEMuonSimAnalyzer.cc index b50ddde681304..ada0ec08c7055 100644 --- a/Calibration/IsolatedParticles/plugins/HcalHBHEMuonSimAnalyzer.cc +++ b/Calibration/IsolatedParticles/plugins/HcalHBHEMuonSimAnalyzer.cc @@ -30,7 +30,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/HcalRaddamMuon.cc b/Calibration/IsolatedParticles/plugins/HcalRaddamMuon.cc index e0553fc62ab26..02a30da0864e7 100644 --- a/Calibration/IsolatedParticles/plugins/HcalRaddamMuon.cc +++ b/Calibration/IsolatedParticles/plugins/HcalRaddamMuon.cc @@ -42,7 +42,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsoTrackCalib.cc b/Calibration/IsolatedParticles/plugins/IsoTrackCalib.cc index 5e711389be3ff..2cb6ef78ff9e1 100644 --- a/Calibration/IsolatedParticles/plugins/IsoTrackCalib.cc +++ b/Calibration/IsolatedParticles/plugins/IsoTrackCalib.cc @@ -65,7 +65,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc index cd1163a30fbdf..dbb8710be39f5 100644 --- a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc +++ b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc @@ -56,7 +56,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsoTrig.cc b/Calibration/IsolatedParticles/plugins/IsoTrig.cc index b9d72b3a90f4a..9bc9a7e3cbd7d 100644 --- a/Calibration/IsolatedParticles/plugins/IsoTrig.cc +++ b/Calibration/IsolatedParticles/plugins/IsoTrig.cc @@ -75,7 +75,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 16114e7a9500f..7ec5dc03c3392 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -59,7 +59,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc index f093efef4bc26..c5c53bec52563 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc @@ -79,7 +79,7 @@ // ecal / hcal #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc index f651667ee3830..e3670218df38b 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksHcalScale.cc @@ -74,7 +74,7 @@ #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc index 1e330f34ed674..259a05b66da96 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc @@ -113,7 +113,7 @@ // ecal / hcal #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc index c3539fe48a83e..e15be0e8a046d 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc @@ -23,7 +23,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc index a19e5cc8f6b17..f64b062aac50f 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc @@ -69,7 +69,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" diff --git a/Calibration/Tools/plugins/SingleEleCalibSelector.cc b/Calibration/Tools/plugins/SingleEleCalibSelector.cc index 9e263cb34a10a..2f7c7165d3b36 100644 --- a/Calibration/Tools/plugins/SingleEleCalibSelector.cc +++ b/Calibration/Tools/plugins/SingleEleCalibSelector.cc @@ -5,7 +5,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc index f3e3736133c68..0ca644721df5d 100644 --- a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc +++ b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc @@ -14,7 +14,7 @@ #include "CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" #include "Geometry/EcalMapping/interface/EcalMappingRcd.h" diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h index 352bb599b2e8a..6a1d576461622 100644 --- a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h +++ b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h @@ -43,7 +43,7 @@ #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CaloOnlineTools/EcalTools/interface/EcalFedMap.h" diff --git a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h index 18cd34278629e..52817c0bbc1e5 100644 --- a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h +++ b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h @@ -43,7 +43,7 @@ #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CaloOnlineTools/EcalTools/interface/EcalFedMap.h" diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc index 9549766a88e90..bc00ec54c959c 100644 --- a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc +++ b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc @@ -24,7 +24,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h index 90c9743c4d9ce..920448c8fff48 100644 --- a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h +++ b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h @@ -27,7 +27,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/EcalRecHit/interface/EcalUncalibratedRecHit.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" diff --git a/Configuration/Skimming/interface/LeptonRecoSkim.h b/Configuration/Skimming/interface/LeptonRecoSkim.h index 120f9bfe3e96e..9edb3d3fa467e 100644 --- a/Configuration/Skimming/interface/LeptonRecoSkim.h +++ b/Configuration/Skimming/interface/LeptonRecoSkim.h @@ -32,7 +32,7 @@ #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "Geometry/CaloTopology/interface/EcalBarrelTopology.h" #include "Geometry/CaloTopology/interface/EcalEndcapTopology.h" diff --git a/DPGAnalysis/Skims/interface/EcalSkim.h b/DPGAnalysis/Skims/interface/EcalSkim.h index 961f61a6a883d..5012e9f976de7 100644 --- a/DPGAnalysis/Skims/interface/EcalSkim.h +++ b/DPGAnalysis/Skims/interface/EcalSkim.h @@ -28,7 +28,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/DetId/interface/DetId.h" diff --git a/DPGAnalysis/Skims/src/EcalSkim.cc b/DPGAnalysis/Skims/src/EcalSkim.cc index 055531f8a891b..7c84c9bbaa4f4 100644 --- a/DPGAnalysis/Skims/src/EcalSkim.cc +++ b/DPGAnalysis/Skims/src/EcalSkim.cc @@ -26,7 +26,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "DataFormats/EgammaReco/interface/SuperCluster.h" #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" diff --git a/DQMOffline/CalibCalo/src/DQMSourcePi0.h b/DQMOffline/CalibCalo/src/DQMSourcePi0.h index c32d025d980cf..2ac2496a50136 100644 --- a/DQMOffline/CalibCalo/src/DQMSourcePi0.h +++ b/DQMOffline/CalibCalo/src/DQMSourcePi0.h @@ -12,7 +12,7 @@ // Geometry #include "DQMServices/Core/interface/DQMEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h index d9b7a0ac9af0d..5dd0911f4d2aa 100644 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h @@ -41,7 +41,7 @@ #include "CommonTools/Statistics/interface/ChiSquaredProbability.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h b/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h index b7c294210c79c..09945bb067589 100644 --- a/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h +++ b/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h @@ -20,7 +20,7 @@ #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h index b94a7d8152e2e..953ae31329090 100644 --- a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h +++ b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h @@ -43,7 +43,7 @@ #include "CommonTools/Statistics/interface/ChiSquaredProbability.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc b/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc index 6f08913e2529d..2bb31f46ff0dd 100644 --- a/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc +++ b/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc @@ -35,7 +35,7 @@ #include "DataFormats/EgammaCandidates/interface/Photon.h" #include "DataFormats/JetReco/interface/CaloJetCollection.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/DQMOffline/Ecal/plugins/ESRecoSummary.cc b/DQMOffline/Ecal/plugins/ESRecoSummary.cc index acc93a66b3f35..c1aeb301ece3d 100644 --- a/DQMOffline/Ecal/plugins/ESRecoSummary.cc +++ b/DQMOffline/Ecal/plugins/ESRecoSummary.cc @@ -20,7 +20,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc index 9cd81d790ea2b..28faf9721b433 100644 --- a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc +++ b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc @@ -14,7 +14,7 @@ #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/VertexReco/interface/Vertex.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/DQMOffline/Trigger/interface/EgHLTOffHelper.h b/DQMOffline/Trigger/interface/EgHLTOffHelper.h index 49eaa7e55dda0..a4672dff8722b 100644 --- a/DQMOffline/Trigger/interface/EgHLTOffHelper.h +++ b/DQMOffline/Trigger/interface/EgHLTOffHelper.h @@ -36,7 +36,7 @@ #include "DQMOffline/Trigger/interface/EgHLTTrigCodes.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml index 1e63654c44fbc..ce87e27eebe6d 100644 --- a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml +++ b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml @@ -16,7 +16,6 @@ - diff --git a/EgammaAnalysis/ElectronTools/plugins/ElectronRegressionEnergyProducer.cc b/EgammaAnalysis/ElectronTools/plugins/ElectronRegressionEnergyProducer.cc index ac09d851b186c..7696c51aef853 100644 --- a/EgammaAnalysis/ElectronTools/plugins/ElectronRegressionEnergyProducer.cc +++ b/EgammaAnalysis/ElectronTools/plugins/ElectronRegressionEnergyProducer.cc @@ -14,7 +14,7 @@ #include "FWCore/Framework/interface/EDFilter.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "DataFormats/EgammaCandidates/interface/GsfElectron.h" #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" diff --git a/EgammaAnalysis/ElectronTools/plugins/RegressionEnergyPatElectronProducer.cc b/EgammaAnalysis/ElectronTools/plugins/RegressionEnergyPatElectronProducer.cc index c16db92c7f61e..2d1673c0ca2d5 100644 --- a/EgammaAnalysis/ElectronTools/plugins/RegressionEnergyPatElectronProducer.cc +++ b/EgammaAnalysis/ElectronTools/plugins/RegressionEnergyPatElectronProducer.cc @@ -8,7 +8,7 @@ #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Utilities/interface/EDMException.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "EgammaAnalysis/ElectronTools/interface/SuperClusterHelper.h" diff --git a/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc b/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc index faae4d81336df..7af0b4425b148 100644 --- a/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc +++ b/FastSimulation/CaloGeometryTools/test/testCaloGeometryTools.cc @@ -24,7 +24,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" diff --git a/FastSimulation/CaloHitMakers/test/testEcalHitMaker.cc b/FastSimulation/CaloHitMakers/test/testEcalHitMaker.cc index 3bb5f6e0258af..7c23a10dfe1f3 100644 --- a/FastSimulation/CaloHitMakers/test/testEcalHitMaker.cc +++ b/FastSimulation/CaloHitMakers/test/testEcalHitMaker.cc @@ -24,7 +24,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/FastSimulation/EventProducer/src/FamosManager.cc b/FastSimulation/EventProducer/src/FamosManager.cc index 2c478212fda9f..af8f99e7b8fd3 100644 --- a/FastSimulation/EventProducer/src/FamosManager.cc +++ b/FastSimulation/EventProducer/src/FamosManager.cc @@ -21,7 +21,7 @@ #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" //#include "Geometry/CaloTopology/interface/CaloTopology.h" // HepMC headers diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc index 1a5264566414e..6a974f6c1d202 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc @@ -42,7 +42,7 @@ #include "FastSimulation/CaloGeometryTools/interface/CaloGeometryHelper.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "FastSimulation/ShowerDevelopment/interface/FastHFShowerLibrary.h" /////////////////////////////////////////////// diff --git a/Geometry/CaloEventSetup/interface/CaloTopologyRecord.h b/Geometry/CaloEventSetup/interface/CaloTopologyRecord.h deleted file mode 100644 index 1ba825dc85ca3..0000000000000 --- a/Geometry/CaloEventSetup/interface/CaloTopologyRecord.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef Geometry_CaloEventSetyp_CaloTopologyRecord -#define Geometry_CaloEventSetyp_CaloTopologyRecord - -//moved so just forward the new one under the old name - -#include "Geometry/Records/interface/CaloTopologyRecord.h" - -#endif diff --git a/Geometry/CaloEventSetup/test/TestEcalGetWindow.cc b/Geometry/CaloEventSetup/test/TestEcalGetWindow.cc index 269b81a0af48c..ee0fa47b23e03 100644 --- a/Geometry/CaloEventSetup/test/TestEcalGetWindow.cc +++ b/Geometry/CaloEventSetup/test/TestEcalGetWindow.cc @@ -6,7 +6,7 @@ #include "FWCore/Utilities/interface/ESGetToken.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h b/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h index 3bc5de8beeb3f..093721d7bc7a7 100644 --- a/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h +++ b/HLTrigger/Egamma/plugins/HLTScoutingEgammaProducer.h @@ -46,7 +46,7 @@ Description: Producer for ScoutingElectron and ScoutingPhoton #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "RecoEcal/EgammaCoreTools/interface/EcalTools.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" #include "DataFormats/Math/interface/libminifloat.h" diff --git a/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc b/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc index 87d37ed90b151..c00b6705db5c7 100644 --- a/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc +++ b/HLTrigger/special/plugins/EcalMIPRecHitFilter.cc @@ -38,7 +38,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h" #include "CondFormats/DataRecord/interface/EcalIntercalibConstantsRcd.h" diff --git a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h index c200ba4bea755..3676fc5e8fc34 100644 --- a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h +++ b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h @@ -31,7 +31,7 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration. #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h index 9491f6e462720..2fe26ef18cc23 100644 --- a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h +++ b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h @@ -29,7 +29,7 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration. #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" // Geometry -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc index ae4250078d6f8..66ef8483e018c 100644 --- a/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc @@ -33,7 +33,7 @@ #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h" #include "CommonTools/Egamma/interface/ConversionTools.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc index 549891a633dfc..8a46951c69ed5 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.cc @@ -8,7 +8,7 @@ #include "DataFormats/HepMCCandidate/interface/GenParticle.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h index 2831391184805..702f0b296608e 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonProducer.h @@ -41,7 +41,7 @@ #include "DataFormats/PatCandidates/interface/UserData.h" #include "PhysicsTools/PatAlgos/interface/PATUserDataHelper.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/RecoCaloTools/Navigation/test/BuildFile.xml b/RecoCaloTools/Navigation/test/BuildFile.xml index d45d75a0965d9..0b306b218378c 100644 --- a/RecoCaloTools/Navigation/test/BuildFile.xml +++ b/RecoCaloTools/Navigation/test/BuildFile.xml @@ -1,8 +1,9 @@ + - + - + diff --git a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc b/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc index a03b6691725ef..793db05fb75b7 100644 --- a/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc +++ b/RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc @@ -11,7 +11,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "RecoCaloTools/Navigation/interface/EcalBarrelNavigator.h" diff --git a/RecoEcal/EgammaClusterAlgos/interface/SCEnergyCorrectorSemiParm.h b/RecoEcal/EgammaClusterAlgos/interface/SCEnergyCorrectorSemiParm.h index 7625731f35f53..4cb0f594a10b2 100644 --- a/RecoEcal/EgammaClusterAlgos/interface/SCEnergyCorrectorSemiParm.h +++ b/RecoEcal/EgammaClusterAlgos/interface/SCEnergyCorrectorSemiParm.h @@ -19,7 +19,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/RecoEcal/EgammaClusterProducers/interface/EcalDigiSelector.h b/RecoEcal/EgammaClusterProducers/interface/EcalDigiSelector.h index 8160551c50ea4..d54d2066e36c0 100644 --- a/RecoEcal/EgammaClusterProducers/interface/EcalDigiSelector.h +++ b/RecoEcal/EgammaClusterProducers/interface/EcalDigiSelector.h @@ -15,7 +15,7 @@ #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" // diff --git a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h index 0ec6130550005..47fe019110cf3 100644 --- a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h @@ -41,7 +41,7 @@ The following classes of "interesting id" are considered #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h" #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h" #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "RecoEcal/EgammaCoreTools/interface/EcalNextToDeadChannelRcd.h" #include "RecoEcal/EgammaCoreTools/interface/EcalTools.h" diff --git a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h index 86339b9d544dd..c81eef6c868d7 100644 --- a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h @@ -43,7 +43,7 @@ The following classes of "interesting id" are considered #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h" #include "RecoEcal/EgammaCoreTools/interface/EcalTools.h" #include "RecoEcal/EgammaCoreTools/interface/EcalNextToDeadChannelRcd.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" class CaloTopology; diff --git a/RecoEcal/EgammaClusterProducers/interface/PFECALSuperClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/PFECALSuperClusterProducer.h index 9f57fd6ae9f35..eec37aaf7e98c 100644 --- a/RecoEcal/EgammaClusterProducers/interface/PFECALSuperClusterProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/PFECALSuperClusterProducer.h @@ -21,7 +21,7 @@ #include "RecoEcal/EgammaClusterAlgos/interface/PFECALSuperClusterAlgo.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "DataFormats/ParticleFlowReco/interface/PFCluster.h" diff --git a/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc b/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc index ecb3e63a375db..72ddd0cef3b44 100644 --- a/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc +++ b/RecoEcal/EgammaClusterProducers/src/InterestingTrackEcalDetIdProducer.cc @@ -26,7 +26,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/RecoEcal/EgammaClusterProducers/src/ReducedRecHitCollectionProducer.cc b/RecoEcal/EgammaClusterProducers/src/ReducedRecHitCollectionProducer.cc index 54fac70742044..b6106690cf934 100644 --- a/RecoEcal/EgammaClusterProducers/src/ReducedRecHitCollectionProducer.cc +++ b/RecoEcal/EgammaClusterProducers/src/ReducedRecHitCollectionProducer.cc @@ -10,7 +10,7 @@ #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h b/RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h index 58160aa29d35a..4ea5ef11fe96e 100644 --- a/RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h +++ b/RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h @@ -27,7 +27,7 @@ #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CondFormats/DataRecord/interface/EcalIntercalibConstantsRcd.h" #include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h" #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecord.h" diff --git a/RecoEcal/EgammaCoreTools/test/filterProbClusters.cc b/RecoEcal/EgammaCoreTools/test/filterProbClusters.cc index 0b23a2fd61c67..da652c291ef31 100644 --- a/RecoEcal/EgammaCoreTools/test/filterProbClusters.cc +++ b/RecoEcal/EgammaCoreTools/test/filterProbClusters.cc @@ -24,7 +24,7 @@ #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" diff --git a/RecoEcal/EgammaCoreTools/test/testEcalClusterLazyTools.cc b/RecoEcal/EgammaCoreTools/test/testEcalClusterLazyTools.cc index c1ba28100ac00..8a2856fd7ddbf 100644 --- a/RecoEcal/EgammaCoreTools/test/testEcalClusterLazyTools.cc +++ b/RecoEcal/EgammaCoreTools/test/testEcalClusterLazyTools.cc @@ -28,7 +28,7 @@ Description: #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include diff --git a/RecoEcal/EgammaCoreTools/test/testEcalClusterSeverityAlgo.cc b/RecoEcal/EgammaCoreTools/test/testEcalClusterSeverityAlgo.cc index 563df0359ae0c..fac73e234641a 100644 --- a/RecoEcal/EgammaCoreTools/test/testEcalClusterSeverityAlgo.cc +++ b/RecoEcal/EgammaCoreTools/test/testEcalClusterSeverityAlgo.cc @@ -41,7 +41,7 @@ Description: #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" diff --git a/RecoEcal/EgammaCoreTools/test/testEcalClusterTools.cc b/RecoEcal/EgammaCoreTools/test/testEcalClusterTools.cc index 922ae0160a6bb..843837719e2f9 100644 --- a/RecoEcal/EgammaCoreTools/test/testEcalClusterTools.cc +++ b/RecoEcal/EgammaCoreTools/test/testEcalClusterTools.cc @@ -28,7 +28,7 @@ Description: #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include diff --git a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTNxNClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTNxNClusterProducer.cc index 8003c7b2948e7..7ceefd3f3b219 100644 --- a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTNxNClusterProducer.cc +++ b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTNxNClusterProducer.cc @@ -39,7 +39,7 @@ Description: simple NxN ( 3x3 etc) clustering ,( for low energy photon reconstru #include "Geometry/CaloTopology/interface/EcalEndcapTopology.h" #include "Geometry/CaloTopology/interface/EcalBarrelTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "TVector3.h" diff --git a/RecoEgamma/EgammaPhotonAlgos/src/PhotonEnergyCorrector.cc b/RecoEgamma/EgammaPhotonAlgos/src/PhotonEnergyCorrector.cc index e084a4740484e..e8d070bac6127 100644 --- a/RecoEgamma/EgammaPhotonAlgos/src/PhotonEnergyCorrector.cc +++ b/RecoEgamma/EgammaPhotonAlgos/src/PhotonEnergyCorrector.cc @@ -3,7 +3,7 @@ #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "DataFormats/EcalDetId/interface/EEDetId.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" diff --git a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc index 72ee92135f557..c4a73d116bab7 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc @@ -30,7 +30,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Utilities/interface/isFinite.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc index 6b89d40905654..b78c82d671279 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc @@ -24,7 +24,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc index dce9ed59114e0..56a87fd6abbbd 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc @@ -33,7 +33,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "RecoEgamma/EgammaIsolationAlgos/interface/EGHcalRecHitSelector.h" diff --git a/RecoEgamma/EgammaTools/interface/BaselinePFSCRegression.h b/RecoEgamma/EgammaTools/interface/BaselinePFSCRegression.h index 7605045961125..8239da5bbf638 100644 --- a/RecoEgamma/EgammaTools/interface/BaselinePFSCRegression.h +++ b/RecoEgamma/EgammaTools/interface/BaselinePFSCRegression.h @@ -3,7 +3,7 @@ #include "RecoEgamma/EgammaTools/interface/SCRegressionCalculator.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/RecoEgamma/EgammaTools/plugins/EG8XObjectUpdateModifier.cc b/RecoEgamma/EgammaTools/plugins/EG8XObjectUpdateModifier.cc index 70c710bf95b18..364327c062dde 100644 --- a/RecoEgamma/EgammaTools/plugins/EG8XObjectUpdateModifier.cc +++ b/RecoEgamma/EgammaTools/plugins/EG8XObjectUpdateModifier.cc @@ -6,7 +6,7 @@ #include "DataFormats/Common/interface/Handle.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" #include "DataFormats/EcalRecHit/interface/EcalRecHit.h" diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc index d1cce43138b3c..4b476a760dd0c 100644 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc +++ b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc @@ -19,7 +19,7 @@ #include "DataFormats/GsfTrackReco/interface/GsfTrack.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "RecoEgamma/EgammaIsolationAlgos/interface/EleTkIsolFromCands.h" diff --git a/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.cc b/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.cc index 600191f632117..c9e0c20e847cb 100644 --- a/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/SimplePhotonAnalyzer.cc @@ -24,7 +24,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/Exception.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.cc b/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.cc index a6ed08aca7291..52030cd1df0de 100644 --- a/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.cc +++ b/RecoEgamma/PhotonIdentification/plugins/PhotonIDSimpleAnalyzer.cc @@ -33,7 +33,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/EcalBarrelTopology.h" #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" diff --git a/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.cc b/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.cc index 12b164cd15445..d8c6ea12ee64e 100644 --- a/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.cc +++ b/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.cc @@ -17,7 +17,7 @@ #include "Geometry/CaloTopology/interface/EcalEndcapTopology.h" #include "Geometry/CaloTopology/interface/EcalPreshowerTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include diff --git a/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h b/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h index 73b4511054e9b..d6d4490bf8952 100644 --- a/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h +++ b/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h @@ -31,7 +31,7 @@ #include "RecoHI/HiEgammaAlgos/interface/HiEgammaSCEnergyCorrectionAlgo.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" class HiEgammaSCCorrectionMaker : public edm::stream::EDProducer<> { diff --git a/RecoJets/JetAnalyzers/test/myJetAna.cc b/RecoJets/JetAnalyzers/test/myJetAna.cc index b3f10df9de1de..a42e1733c44f9 100644 --- a/RecoJets/JetAnalyzers/test/myJetAna.cc +++ b/RecoJets/JetAnalyzers/test/myJetAna.cc @@ -2,7 +2,7 @@ // Description: Access Cruzet Data // Author: Frank Chlebana // Date: 24 - July - 2008 -// +// #include "RecoJets/JetAnalyzers/interface/myJetAna.h" #include "RecoJets/JetAlgorithms/interface/JetAlgoHelper.h" #include "DataFormats/JetReco/interface/CaloJetCollection.h" @@ -25,12 +25,11 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" -#include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h" @@ -46,7 +45,6 @@ // #include "DataFormats/PhotonReco/interface/PhotonFwd.h" // #include "DataFormats/PhotonReco/interface/Photon.h" - #include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/Math/interface/deltaPhi.h" // #include "DataFormats/HepMCCandidate/interface/GenParticleCandidate.h" @@ -69,8 +67,7 @@ // include files #include "DataFormats/METReco/interface/HcalNoiseSummary.h" -#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h" - +#include "DataFormats/METReco/interface/HcalCaloFlagLabels.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "JetMETCorrections/Objects/interface/JetCorrector.h" @@ -84,7 +81,6 @@ using namespace edm; using namespace reco; using namespace std; - #define INVALID 9999. #define DEBUG false #define MAXJETS 100 @@ -93,503 +89,487 @@ typedef struct RBX_struct { double et; double hadEnergy; double emEnergy; - float hcalTime; - float ecalTime; - int nTowers; -} RBX ; + float hcalTime; + float ecalTime; + int nTowers; +} RBX; typedef struct HPD_struct { double et; double hadEnergy; double emEnergy; double time; - float hcalTime; - float ecalTime; - int nTowers; -} HPD ; - + float hcalTime; + float ecalTime; + int nTowers; +} HPD; // ************************ // ************************ -// Get the algorithm of the jet collections we will read from the .cfg file +// Get the algorithm of the jet collections we will read from the .cfg file // which defines the value of the strings CaloJetAlgorithm and GenJetAlgorithm. -myJetAna::myJetAna( const ParameterSet & cfg ) : - CaloJetAlgorithm( cfg.getParameter( "CaloJetAlgorithm" ) ), - GenJetAlgorithm( cfg.getParameter( "GenJetAlgorithm" ) ), - hcalNoiseSummaryTag_(cfg.getParameter("hcalNoiseSummaryTag")) -{ +myJetAna::myJetAna(const ParameterSet &cfg) + : CaloJetAlgorithm(cfg.getParameter("CaloJetAlgorithm")), + GenJetAlgorithm(cfg.getParameter("GenJetAlgorithm")), + hcalNoiseSummaryTag_(cfg.getParameter("hcalNoiseSummaryTag")) { theTriggerResultsLabel = cfg.getParameter("TriggerResultsLabel"); } - // ************************ // ************************ -void myJetAna::beginJob( ) { - - - +void myJetAna::beginJob() { edm::Service fs; - // --- passed selection cuts - h_pt = fs->make( "pt", "Jet p_{T}", 100, 0, 50 ); - h_ptRBX = fs->make( "ptRBX", "RBX: Jet p_{T}", 100, 0, 50 ); - h_ptHPD = fs->make( "ptHPD", "HPD: Jet p_{T}", 100, 0, 50 ); - h_ptTower = fs->make( "ptTower", "Jet p_{T}", 100, 0, 50 ); - h_et = fs->make( "et", "Jet E_{T}", 100, 0, 50 ); - h_eta = fs->make( "eta", "Jet #eta", 100, -5, 5 ); - h_phi = fs->make( "phi", "Jet #phi", 50, -M_PI, M_PI ); + // --- passed selection cuts + h_pt = fs->make("pt", "Jet p_{T}", 100, 0, 50); + h_ptRBX = fs->make("ptRBX", "RBX: Jet p_{T}", 100, 0, 50); + h_ptHPD = fs->make("ptHPD", "HPD: Jet p_{T}", 100, 0, 50); + h_ptTower = fs->make("ptTower", "Jet p_{T}", 100, 0, 50); + h_et = fs->make("et", "Jet E_{T}", 100, 0, 50); + h_eta = fs->make("eta", "Jet #eta", 100, -5, 5); + h_phi = fs->make("phi", "Jet #phi", 50, -M_PI, M_PI); // --- - hitEtaEt = fs->make( "hitEtaEt", "RecHit #eta", 90, -45, 45 ); - hitEta = fs->make( "hitEta", "RecHit #eta", 90, -45, 45 ); - hitPhi = fs->make( "hitPhi", "RecHit #phi", 73, 0, 73 ); - - caloEtaEt = fs->make( "caloEtaEt", "CaloTower #eta", 100, -4, 4 ); - caloEta = fs->make( "caloEta", "CaloTower #eta", 100, -4, 4 ); - caloPhi = fs->make( "caloPhi", "CaloTower #phi", 50, -M_PI, M_PI ); - - dijetMass = fs->make("dijetMass","DiJet Mass",100,0,100); - - totEneLeadJetEta1 = fs->make("totEneLeadJetEta1","Total Energy Lead Jet Eta1 1",100,0,100); - totEneLeadJetEta2 = fs->make("totEneLeadJetEta2","Total Energy Lead Jet Eta2 1",150,0,150); - totEneLeadJetEta3 = fs->make("totEneLeadJetEta3","Total Energy Lead Jet Eta3 1",150,0,150); - - hadEneLeadJetEta1 = fs->make("hadEneLeadJetEta1","Hadronic Energy Lead Jet Eta1 1",50,0,50); - hadEneLeadJetEta2 = fs->make("hadEneLeadJetEta2","Hadronic Energy Lead Jet Eta2 1",100,0,100); - hadEneLeadJetEta3 = fs->make("hadEneLeadJetEta3","Hadronic Energy Lead Jet Eta3 1",100,0,100); - emEneLeadJetEta1 = fs->make("emEneLeadJetEta1","EM Energy Lead Jet Eta1 1",50,0,50); - emEneLeadJetEta2 = fs->make("emEneLeadJetEta2","EM Energy Lead Jet Eta2 1",100,0,100); - emEneLeadJetEta3 = fs->make("emEneLeadJetEta3","EM Energy Lead Jet Eta3 1",100,0,100); - - - hadFracEta1 = fs->make("hadFracEta11","Hadronic Fraction Eta1 Jet 1",100,0,1); - hadFracEta2 = fs->make("hadFracEta21","Hadronic Fraction Eta2 Jet 1",100,0,1); - hadFracEta3 = fs->make("hadFracEta31","Hadronic Fraction Eta3 Jet 1",100,0,1); + hitEtaEt = fs->make("hitEtaEt", "RecHit #eta", 90, -45, 45); + hitEta = fs->make("hitEta", "RecHit #eta", 90, -45, 45); + hitPhi = fs->make("hitPhi", "RecHit #phi", 73, 0, 73); + + caloEtaEt = fs->make("caloEtaEt", "CaloTower #eta", 100, -4, 4); + caloEta = fs->make("caloEta", "CaloTower #eta", 100, -4, 4); + caloPhi = fs->make("caloPhi", "CaloTower #phi", 50, -M_PI, M_PI); + + dijetMass = fs->make("dijetMass", "DiJet Mass", 100, 0, 100); - HFSumEt = fs->make("HFSumEt","HFSumEt",100,0,100); - HFMET = fs->make("HFMET", "HFMET",120,0,120); + totEneLeadJetEta1 = fs->make("totEneLeadJetEta1", "Total Energy Lead Jet Eta1 1", 100, 0, 100); + totEneLeadJetEta2 = fs->make("totEneLeadJetEta2", "Total Energy Lead Jet Eta2 1", 150, 0, 150); + totEneLeadJetEta3 = fs->make("totEneLeadJetEta3", "Total Energy Lead Jet Eta3 1", 150, 0, 150); - SumEt = fs->make("SumEt","SumEt",100,0,100); - MET = fs->make("MET", "MET",120,0,120); - OERMET = fs->make("OERMET", "OERMET",120,0,120); - METSig = fs->make("METSig", "METSig",100,0,50); - MEx = fs->make("MEx", "MEx",100,-20,20); - MEy = fs->make("MEy", "MEy",100,-20,20); - METPhi = fs->make("METPhi", "METPhi",315,0,3.15); - MET_RBX = fs->make("MET_RBX", "MET",100,0,1000); - MET_HPD = fs->make("MET_HPD", "MET",100,0,1000); - MET_Tower = fs->make("MET_Tower", "MET",100,0,1000); - - SiClusters = fs->make("SiClusters", "SiClusters",150,0,1500); - - h_Vx = fs->make("Vx", "Vx",100,-0.5,0.5); - h_Vy = fs->make("Vy", "Vy",100,-0.5,0.5); - h_Vz = fs->make("Vz", "Vz",100,-20,20); - h_VNTrks = fs->make("VNTrks", "VNTrks",10,1,100); - - h_Trk_pt = fs->make("Trk_pt", "Trk_pt",100,0,20); - h_Trk_NTrk = fs->make("Trk_NTrk", "Trk_NTrk",150,0,150); - - hf_sumTowerAllEx = fs->make("sumTowerAllEx","Tower Ex",100,-1000,1000); - hf_sumTowerAllEy = fs->make("sumTowerAllEy","Tower Ey",100,-1000,1000); - - hf_TowerJetEt = fs->make("TowerJetEt","Tower/Jet Et 1",50,0,1); - - ETime = fs->make("ETime","Ecal Time",200,-200,200); - HTime = fs->make("HTime","Hcal Time",200,-200,200); - - towerHadEnHB = fs->make("towerHadEnHB" ,"HB: Calo Tower HAD Energy",210,-1,20); - towerHadEnHE = fs->make("towerHadEnHE" ,"HE: Calo Tower HAD Energy",510,-1,50); - towerHadEnHF = fs->make("towerHadEnHF" ,"HF: Calo Tower HAD Energy",510,-1,50); - - towerEmEnHB = fs->make("towerEmEnHB" ,"HB: Calo Tower EM Energy",210,-1,20); - towerEmEnHE = fs->make("towerEmEnHE" ,"HE: Calo Tower EM Energy",510,-1,50); - towerEmEnHF = fs->make("towerEmEnHF" ,"HF: Calo Tower EM Energy",510,-1,50); - - towerHadEn = fs->make("towerHadEn" ,"Hadronic Energy in Calo Tower",2000,-100,100); - towerEmEn = fs->make("towerEmEn" ,"EM Energy in Calo Tower",2000,-100,100); - towerOuterEn = fs->make("towerOuterEn" ,"HO Energy in Calo Tower",2000,-100,100); - - towerEmFrac = fs->make("towerEmFrac","EM Fraction of Energy in Calo Tower",100,-1.,1.); - - RBX_et = fs->make("RBX_et","ET in RBX",1000,-20,100); - RBX_hadEnergy = fs->make("RBX_hadEnergy","Hcal Energy in RBX",1000,-20,100); - RBX_hcalTime = fs->make("RBX_hcalTime","Hcal Time in RBX",200,-200,200); - RBX_nTowers = fs->make("RBX_nTowers","Number of Towers in RBX",75,0,75); - RBX_N = fs->make("RBX_N","Number of RBX",10,0,10); - - HPD_et = fs->make("HPD_et","ET in HPD",1000,-20,100); - HPD_hadEnergy = fs->make("HPD_hadEnergy","Hcal Energy in HPD",1000,-20,100); - HPD_hcalTime = fs->make("HPD_hcalTime","Hcal Time in HPD",200,-200,200); - HPD_nTowers = fs->make("HPD_nTowers","Number of Towers in HPD",20,0,20); - HPD_N = fs->make("HPD_N","Number of HPD",10,0,10); - - nTowers1 = fs->make("nTowers1","Number of Towers pt 0.5",100,0,200); - nTowers2 = fs->make("nTowers2","Number of Towers pt 1.0",100,0,200); - nTowers3 = fs->make("nTowers3","Number of Towers pt 1.5",100,0,200); - nTowers4 = fs->make("nTowers4","Number of Towers pt 2.0",100,0,200); - - nTowersLeadJetPt1 = fs->make("nTowersLeadJetPt1","Number of Towers in Lead Jet pt 0.5",100,0,100); - nTowersLeadJetPt2 = fs->make("nTowersLeadJetPt2","Number of Towers in Lead Jet pt 1.0",100,0,100); - nTowersLeadJetPt3 = fs->make("nTowersLeadJetPt3","Number of Towers in Lead Jet pt 1.5",100,0,100); - nTowersLeadJetPt4 = fs->make("nTowersLeadJetPt4","Number of Towers in Lead Jet pt 2.0",100,0,100); - - h_nCalJets = fs->make( "nCalJets", "Number of CalJets", 20, 0, 20 ); - - HBEneOOT = fs->make( "HBEneOOT", "HBEneOOT", 200, -5, 10 ); - HEEneOOT = fs->make( "HEEneOOT", "HEEneOOT", 200, -5, 10 ); - HFEneOOT = fs->make( "HFEneOOT", "HFEneOOT", 200, -5, 10 ); - HOEneOOT = fs->make( "HOEneOOT", "HOEneOOT", 200, -5, 10 ); - - HBEneOOTTh = fs->make( "HBEneOOTTh", "HBEneOOTTh", 200, -5, 10 ); - HEEneOOTTh = fs->make( "HEEneOOTTh", "HEEneOOTTh", 200, -5, 10 ); - HFEneOOTTh = fs->make( "HFEneOOTTh", "HFEneOOTTh", 200, -5, 10 ); - HOEneOOTTh = fs->make( "HOEneOOTTh", "HOEneOOTTh", 200, -5, 10 ); - - HBEneOOTTh1 = fs->make( "HBEneOOTTh1", "HBEneOOT", 200, -5, 10 ); - HEEneOOTTh1 = fs->make( "HEEneOOTTh1", "HEEneOOT", 200, -5, 10 ); - HFEneOOTTh1 = fs->make( "HFEneOOTTh1", "HFEneOOT", 200, -5, 10 ); - HOEneOOTTh1 = fs->make( "HOEneOOTTh1", "HOEneOOT", 200, -5, 10 ); - - HBEneTThr = fs->make( "HBEneTThr", "HBEneTThr", 105, -5, 100 ); - HEEneTThr = fs->make( "HEEneTThr", "HEEneTThr", 105, -5, 100 ); - HFEneTThr = fs->make( "HFEneTThr", "HFEneTThr", 105, -5, 100 ); - - - HBEne = fs->make( "HBEne", "HBEne", 205, -5, 200 ); - HBEneTh = fs->make( "HBEneTh", "HBEneTh", 205, -5, 200 ); - HBEneTh1 = fs->make( "HBEneTh1", "HBEneTh1", 205, -5, 200 ); - HBEneX = fs->make( "HBEneX", "HBEneX", 200, -5, 10 ); - HBEneY = fs->make( "HBEneY", "HBEnedY", 200, -5, 10 ); - HBTime = fs->make( "HBTime", "HBTime", 200, -100, 100 ); - HBTimeTh = fs->make( "HBTimeTh", "HBTimeTh", 200, -100, 100 ); - HBTimeTh1 = fs->make( "HBTimeTh1", "HBTimeTh1", 200, -100, 100 ); - HBTimeTh2 = fs->make( "HBTimeTh2", "HBTimeTh2", 200, -100, 100 ); - HBTimeTh3 = fs->make( "HBTimeTh3", "HBTimeTh3", 200, -100, 100 ); - HBTimeThR = fs->make( "HBTimeThR", "HBTimeThR", 200, -100, 100 ); - HBTimeTh1R = fs->make( "HBTimeTh1R", "HBTimeTh1R", 200, -100, 100 ); - HBTimeTh2R = fs->make( "HBTimeTh2R", "HBTimeTh2R", 200, -100, 100 ); - HBTimeTh3R = fs->make( "HBTimeTh3R", "HBTimeTh3R", 200, -100, 100 ); - - HBTimeFlagged = fs->make( "HBTimeFlagged", "HBTimeFlagged", 200, -100, 100 ); - HBTimeThFlagged = fs->make( "HBTimeThFlagged", "HBTimeThFlagged", 200, -100, 100 ); - HBTimeTh1Flagged = fs->make( "HBTimeTh1Flagged", "HBTimeTh1Flagged", 200, -100, 100 ); - HBTimeTh2Flagged = fs->make( "HBTimeTh2Flagged", "HBTimeTh2Flagged", 200, -100, 100 ); - - HBTimeFlagged2 = fs->make( "HBTimeFlagged2", "HBTimeFlagged2", 200, -100, 100 ); - HBTimeThFlagged2 = fs->make( "HBTimeThFlagged2", "HBTimeThFlagged2", 200, -100, 100 ); - HBTimeTh1Flagged2 = fs->make( "HBTimeTh1Flagged2", "HBTimeTh1Flagged2", 200, -100, 100 ); - HBTimeTh2Flagged2 = fs->make( "HBTimeTh2Flagged2", "HBTimeTh2Flagged2", 200, -100, 100 ); - - HBTimeX = fs->make( "HBTimeX", "HBTimeX", 200, -100, 100 ); - HBTimeY = fs->make( "HBTimeY", "HBTimeY", 200, -100, 100 ); - HEEne = fs->make( "HEEne", "HEEne", 205, -5, 200 ); - HEEneTh = fs->make( "HEEneTh", "HEEneTh", 205, -5, 200 ); - HEEneTh1 = fs->make( "HEEneTh1", "HEEneTh1", 205, -5, 200 ); - HEEneX = fs->make( "HEEneX", "HEEneX", 200, -5, 10 ); - HEEneY = fs->make( "HEEneY", "HEEneY", 200, -5, 10 ); - HEposEne = fs->make( "HEposEne", "HEposEne", 200, -5, 10 ); - HEnegEne = fs->make( "HEnegEne", "HEnegEne", 200, -5, 10 ); - HETime = fs->make( "HETime", "HETime", 200, -100, 100 ); - HETimeTh = fs->make( "HETimeTh", "HETimeTh", 200, -100, 100 ); - HETimeTh1 = fs->make( "HETimeTh1", "HETimeTh1", 200, -100, 100 ); - HETimeTh2 = fs->make( "HETimeTh2", "HETimeTh2", 200, -100, 100 ); - HETimeTh3 = fs->make( "HETimeTh3", "HETimeTh3", 200, -100, 100 ); - HETimeThR = fs->make( "HETimeThR", "HETimeThR", 200, -100, 100 ); - HETimeTh1R = fs->make( "HETimeTh1R", "HETimeTh1R", 200, -100, 100 ); - HETimeTh2R = fs->make( "HETimeTh2R", "HETimeTh2R", 200, -100, 100 ); - HETimeTh3R = fs->make( "HETimeTh3R", "HETimeTh3R", 200, -100, 100 ); - - HETimeFlagged = fs->make( "HETimeFlagged", "HETimeFlagged", 200, -100, 100 ); - HETimeThFlagged = fs->make( "HETimeThFlagged", "HETimeThFlagged", 200, -100, 100 ); - HETimeTh1Flagged = fs->make( "HETimeTh1Flagged", "HETimeTh1Flagged", 200, -100, 100 ); - HETimeTh2Flagged = fs->make( "HETimeTh2Flagged", "HETimeTh2Flagged", 200, -100, 100 ); - - HETimeFlagged2 = fs->make( "HETimeFlagged2", "HETimeFlagged2", 200, -100, 100 ); - HETimeThFlagged2 = fs->make( "HETimeThFlagged2", "HETimeThFlagged2", 200, -100, 100 ); - HETimeTh1Flagged2 = fs->make( "HETimeTh1Flagged2", "HETimeTh1Flagged2", 200, -100, 100 ); - HETimeTh2Flagged2 = fs->make( "HETimeTh2Flagged2", "HETimeTh2Flagged2", 200, -100, 100 ); - - HETimeX = fs->make( "HETimeX", "HETimeX", 200, -100, 100 ); - HETimeY = fs->make( "HETimeY", "HETimeY", 200, -100, 100 ); - HEposTime = fs->make( "HEposTime", "HEposTime", 200, -100, 100 ); - HEnegTime = fs->make( "HEnegTime", "HEnegTime", 200, -100, 100 ); - HOEne = fs->make( "HOEne", "HOEne", 200, -5, 10 ); - HOEneTh = fs->make( "HOEneTh", "HOEneTh", 200, -5, 10 ); - HOEneTh1 = fs->make( "HOEneTh1", "HOEneTh1", 200, -5, 10 ); - HOTime = fs->make( "HOTime", "HOTime", 200, -100, 100 ); - HOTimeTh = fs->make( "HOTimeTh", "HOTimeTh", 200, -100, 100 ); + hadEneLeadJetEta1 = fs->make("hadEneLeadJetEta1", "Hadronic Energy Lead Jet Eta1 1", 50, 0, 50); + hadEneLeadJetEta2 = fs->make("hadEneLeadJetEta2", "Hadronic Energy Lead Jet Eta2 1", 100, 0, 100); + hadEneLeadJetEta3 = fs->make("hadEneLeadJetEta3", "Hadronic Energy Lead Jet Eta3 1", 100, 0, 100); + emEneLeadJetEta1 = fs->make("emEneLeadJetEta1", "EM Energy Lead Jet Eta1 1", 50, 0, 50); + emEneLeadJetEta2 = fs->make("emEneLeadJetEta2", "EM Energy Lead Jet Eta2 1", 100, 0, 100); + emEneLeadJetEta3 = fs->make("emEneLeadJetEta3", "EM Energy Lead Jet Eta3 1", 100, 0, 100); + + hadFracEta1 = fs->make("hadFracEta11", "Hadronic Fraction Eta1 Jet 1", 100, 0, 1); + hadFracEta2 = fs->make("hadFracEta21", "Hadronic Fraction Eta2 Jet 1", 100, 0, 1); + hadFracEta3 = fs->make("hadFracEta31", "Hadronic Fraction Eta3 Jet 1", 100, 0, 1); + + HFSumEt = fs->make("HFSumEt", "HFSumEt", 100, 0, 100); + HFMET = fs->make("HFMET", "HFMET", 120, 0, 120); + + SumEt = fs->make("SumEt", "SumEt", 100, 0, 100); + MET = fs->make("MET", "MET", 120, 0, 120); + OERMET = fs->make("OERMET", "OERMET", 120, 0, 120); + METSig = fs->make("METSig", "METSig", 100, 0, 50); + MEx = fs->make("MEx", "MEx", 100, -20, 20); + MEy = fs->make("MEy", "MEy", 100, -20, 20); + METPhi = fs->make("METPhi", "METPhi", 315, 0, 3.15); + MET_RBX = fs->make("MET_RBX", "MET", 100, 0, 1000); + MET_HPD = fs->make("MET_HPD", "MET", 100, 0, 1000); + MET_Tower = fs->make("MET_Tower", "MET", 100, 0, 1000); + + SiClusters = fs->make("SiClusters", "SiClusters", 150, 0, 1500); + + h_Vx = fs->make("Vx", "Vx", 100, -0.5, 0.5); + h_Vy = fs->make("Vy", "Vy", 100, -0.5, 0.5); + h_Vz = fs->make("Vz", "Vz", 100, -20, 20); + h_VNTrks = fs->make("VNTrks", "VNTrks", 10, 1, 100); + + h_Trk_pt = fs->make("Trk_pt", "Trk_pt", 100, 0, 20); + h_Trk_NTrk = fs->make("Trk_NTrk", "Trk_NTrk", 150, 0, 150); + + hf_sumTowerAllEx = fs->make("sumTowerAllEx", "Tower Ex", 100, -1000, 1000); + hf_sumTowerAllEy = fs->make("sumTowerAllEy", "Tower Ey", 100, -1000, 1000); + + hf_TowerJetEt = fs->make("TowerJetEt", "Tower/Jet Et 1", 50, 0, 1); + + ETime = fs->make("ETime", "Ecal Time", 200, -200, 200); + HTime = fs->make("HTime", "Hcal Time", 200, -200, 200); + + towerHadEnHB = fs->make("towerHadEnHB", "HB: Calo Tower HAD Energy", 210, -1, 20); + towerHadEnHE = fs->make("towerHadEnHE", "HE: Calo Tower HAD Energy", 510, -1, 50); + towerHadEnHF = fs->make("towerHadEnHF", "HF: Calo Tower HAD Energy", 510, -1, 50); + + towerEmEnHB = fs->make("towerEmEnHB", "HB: Calo Tower EM Energy", 210, -1, 20); + towerEmEnHE = fs->make("towerEmEnHE", "HE: Calo Tower EM Energy", 510, -1, 50); + towerEmEnHF = fs->make("towerEmEnHF", "HF: Calo Tower EM Energy", 510, -1, 50); + + towerHadEn = fs->make("towerHadEn", "Hadronic Energy in Calo Tower", 2000, -100, 100); + towerEmEn = fs->make("towerEmEn", "EM Energy in Calo Tower", 2000, -100, 100); + towerOuterEn = fs->make("towerOuterEn", "HO Energy in Calo Tower", 2000, -100, 100); + + towerEmFrac = fs->make("towerEmFrac", "EM Fraction of Energy in Calo Tower", 100, -1., 1.); + + RBX_et = fs->make("RBX_et", "ET in RBX", 1000, -20, 100); + RBX_hadEnergy = fs->make("RBX_hadEnergy", "Hcal Energy in RBX", 1000, -20, 100); + RBX_hcalTime = fs->make("RBX_hcalTime", "Hcal Time in RBX", 200, -200, 200); + RBX_nTowers = fs->make("RBX_nTowers", "Number of Towers in RBX", 75, 0, 75); + RBX_N = fs->make("RBX_N", "Number of RBX", 10, 0, 10); + + HPD_et = fs->make("HPD_et", "ET in HPD", 1000, -20, 100); + HPD_hadEnergy = fs->make("HPD_hadEnergy", "Hcal Energy in HPD", 1000, -20, 100); + HPD_hcalTime = fs->make("HPD_hcalTime", "Hcal Time in HPD", 200, -200, 200); + HPD_nTowers = fs->make("HPD_nTowers", "Number of Towers in HPD", 20, 0, 20); + HPD_N = fs->make("HPD_N", "Number of HPD", 10, 0, 10); + + nTowers1 = fs->make("nTowers1", "Number of Towers pt 0.5", 100, 0, 200); + nTowers2 = fs->make("nTowers2", "Number of Towers pt 1.0", 100, 0, 200); + nTowers3 = fs->make("nTowers3", "Number of Towers pt 1.5", 100, 0, 200); + nTowers4 = fs->make("nTowers4", "Number of Towers pt 2.0", 100, 0, 200); + + nTowersLeadJetPt1 = fs->make("nTowersLeadJetPt1", "Number of Towers in Lead Jet pt 0.5", 100, 0, 100); + nTowersLeadJetPt2 = fs->make("nTowersLeadJetPt2", "Number of Towers in Lead Jet pt 1.0", 100, 0, 100); + nTowersLeadJetPt3 = fs->make("nTowersLeadJetPt3", "Number of Towers in Lead Jet pt 1.5", 100, 0, 100); + nTowersLeadJetPt4 = fs->make("nTowersLeadJetPt4", "Number of Towers in Lead Jet pt 2.0", 100, 0, 100); + + h_nCalJets = fs->make("nCalJets", "Number of CalJets", 20, 0, 20); + + HBEneOOT = fs->make("HBEneOOT", "HBEneOOT", 200, -5, 10); + HEEneOOT = fs->make("HEEneOOT", "HEEneOOT", 200, -5, 10); + HFEneOOT = fs->make("HFEneOOT", "HFEneOOT", 200, -5, 10); + HOEneOOT = fs->make("HOEneOOT", "HOEneOOT", 200, -5, 10); + + HBEneOOTTh = fs->make("HBEneOOTTh", "HBEneOOTTh", 200, -5, 10); + HEEneOOTTh = fs->make("HEEneOOTTh", "HEEneOOTTh", 200, -5, 10); + HFEneOOTTh = fs->make("HFEneOOTTh", "HFEneOOTTh", 200, -5, 10); + HOEneOOTTh = fs->make("HOEneOOTTh", "HOEneOOTTh", 200, -5, 10); + + HBEneOOTTh1 = fs->make("HBEneOOTTh1", "HBEneOOT", 200, -5, 10); + HEEneOOTTh1 = fs->make("HEEneOOTTh1", "HEEneOOT", 200, -5, 10); + HFEneOOTTh1 = fs->make("HFEneOOTTh1", "HFEneOOT", 200, -5, 10); + HOEneOOTTh1 = fs->make("HOEneOOTTh1", "HOEneOOT", 200, -5, 10); + + HBEneTThr = fs->make("HBEneTThr", "HBEneTThr", 105, -5, 100); + HEEneTThr = fs->make("HEEneTThr", "HEEneTThr", 105, -5, 100); + HFEneTThr = fs->make("HFEneTThr", "HFEneTThr", 105, -5, 100); + + HBEne = fs->make("HBEne", "HBEne", 205, -5, 200); + HBEneTh = fs->make("HBEneTh", "HBEneTh", 205, -5, 200); + HBEneTh1 = fs->make("HBEneTh1", "HBEneTh1", 205, -5, 200); + HBEneX = fs->make("HBEneX", "HBEneX", 200, -5, 10); + HBEneY = fs->make("HBEneY", "HBEnedY", 200, -5, 10); + HBTime = fs->make("HBTime", "HBTime", 200, -100, 100); + HBTimeTh = fs->make("HBTimeTh", "HBTimeTh", 200, -100, 100); + HBTimeTh1 = fs->make("HBTimeTh1", "HBTimeTh1", 200, -100, 100); + HBTimeTh2 = fs->make("HBTimeTh2", "HBTimeTh2", 200, -100, 100); + HBTimeTh3 = fs->make("HBTimeTh3", "HBTimeTh3", 200, -100, 100); + HBTimeThR = fs->make("HBTimeThR", "HBTimeThR", 200, -100, 100); + HBTimeTh1R = fs->make("HBTimeTh1R", "HBTimeTh1R", 200, -100, 100); + HBTimeTh2R = fs->make("HBTimeTh2R", "HBTimeTh2R", 200, -100, 100); + HBTimeTh3R = fs->make("HBTimeTh3R", "HBTimeTh3R", 200, -100, 100); + + HBTimeFlagged = fs->make("HBTimeFlagged", "HBTimeFlagged", 200, -100, 100); + HBTimeThFlagged = fs->make("HBTimeThFlagged", "HBTimeThFlagged", 200, -100, 100); + HBTimeTh1Flagged = fs->make("HBTimeTh1Flagged", "HBTimeTh1Flagged", 200, -100, 100); + HBTimeTh2Flagged = fs->make("HBTimeTh2Flagged", "HBTimeTh2Flagged", 200, -100, 100); + + HBTimeFlagged2 = fs->make("HBTimeFlagged2", "HBTimeFlagged2", 200, -100, 100); + HBTimeThFlagged2 = fs->make("HBTimeThFlagged2", "HBTimeThFlagged2", 200, -100, 100); + HBTimeTh1Flagged2 = fs->make("HBTimeTh1Flagged2", "HBTimeTh1Flagged2", 200, -100, 100); + HBTimeTh2Flagged2 = fs->make("HBTimeTh2Flagged2", "HBTimeTh2Flagged2", 200, -100, 100); + + HBTimeX = fs->make("HBTimeX", "HBTimeX", 200, -100, 100); + HBTimeY = fs->make("HBTimeY", "HBTimeY", 200, -100, 100); + HEEne = fs->make("HEEne", "HEEne", 205, -5, 200); + HEEneTh = fs->make("HEEneTh", "HEEneTh", 205, -5, 200); + HEEneTh1 = fs->make("HEEneTh1", "HEEneTh1", 205, -5, 200); + HEEneX = fs->make("HEEneX", "HEEneX", 200, -5, 10); + HEEneY = fs->make("HEEneY", "HEEneY", 200, -5, 10); + HEposEne = fs->make("HEposEne", "HEposEne", 200, -5, 10); + HEnegEne = fs->make("HEnegEne", "HEnegEne", 200, -5, 10); + HETime = fs->make("HETime", "HETime", 200, -100, 100); + HETimeTh = fs->make("HETimeTh", "HETimeTh", 200, -100, 100); + HETimeTh1 = fs->make("HETimeTh1", "HETimeTh1", 200, -100, 100); + HETimeTh2 = fs->make("HETimeTh2", "HETimeTh2", 200, -100, 100); + HETimeTh3 = fs->make("HETimeTh3", "HETimeTh3", 200, -100, 100); + HETimeThR = fs->make("HETimeThR", "HETimeThR", 200, -100, 100); + HETimeTh1R = fs->make("HETimeTh1R", "HETimeTh1R", 200, -100, 100); + HETimeTh2R = fs->make("HETimeTh2R", "HETimeTh2R", 200, -100, 100); + HETimeTh3R = fs->make("HETimeTh3R", "HETimeTh3R", 200, -100, 100); + + HETimeFlagged = fs->make("HETimeFlagged", "HETimeFlagged", 200, -100, 100); + HETimeThFlagged = fs->make("HETimeThFlagged", "HETimeThFlagged", 200, -100, 100); + HETimeTh1Flagged = fs->make("HETimeTh1Flagged", "HETimeTh1Flagged", 200, -100, 100); + HETimeTh2Flagged = fs->make("HETimeTh2Flagged", "HETimeTh2Flagged", 200, -100, 100); + + HETimeFlagged2 = fs->make("HETimeFlagged2", "HETimeFlagged2", 200, -100, 100); + HETimeThFlagged2 = fs->make("HETimeThFlagged2", "HETimeThFlagged2", 200, -100, 100); + HETimeTh1Flagged2 = fs->make("HETimeTh1Flagged2", "HETimeTh1Flagged2", 200, -100, 100); + HETimeTh2Flagged2 = fs->make("HETimeTh2Flagged2", "HETimeTh2Flagged2", 200, -100, 100); + + HETimeX = fs->make("HETimeX", "HETimeX", 200, -100, 100); + HETimeY = fs->make("HETimeY", "HETimeY", 200, -100, 100); + HEposTime = fs->make("HEposTime", "HEposTime", 200, -100, 100); + HEnegTime = fs->make("HEnegTime", "HEnegTime", 200, -100, 100); + HOEne = fs->make("HOEne", "HOEne", 200, -5, 10); + HOEneTh = fs->make("HOEneTh", "HOEneTh", 200, -5, 10); + HOEneTh1 = fs->make("HOEneTh1", "HOEneTh1", 200, -5, 10); + HOTime = fs->make("HOTime", "HOTime", 200, -100, 100); + HOTimeTh = fs->make("HOTimeTh", "HOTimeTh", 200, -100, 100); // Histos for separating SiPMs and HPDs in HO: - HOSEne = fs->make( "HOSEne", "HOSEne", 12000, -20, 100 ); - HOSTime = fs->make( "HOSTime", "HOSTime", 200, -100, 100 ); - HOHEne = fs->make( "HOHEne", "HOHEne", 12000, -20, 100 ); - HOHTime = fs->make( "HOHTime", "HOHTime", 200, -100, 100 ); - - HOHr0Ene = fs->make( "HOHr0Ene" , "HOHr0Ene", 12000, -20 , 100 ); - HOHr0Time = fs->make( "HOHr0Time" , "HOHr0Time", 200, -200, 200 ); - HOHrm1Ene = fs->make( "HOHrm1Ene" , "HOHrm1Ene", 12000, -20 , 100 ); - HOHrm1Time = fs->make( "HOHrm1Time", "HOHrm1Time", 200, -200, 200 ); - HOHrm2Ene = fs->make( "HOHrm2Ene" , "HOHrm2Ene", 12000, -20 , 100 ); - HOHrm2Time = fs->make( "HOHrm2Time", "HOHrm2Time", 200, -200, 200 ); - HOHrp1Ene = fs->make( "HOHrp1Ene" , "HOHrp1Ene", 12000, -20 , 100 ); - HOHrp1Time = fs->make( "HOHrp1Time", "HOHrp1Time", 200, -200, 200 ); - HOHrp2Ene = fs->make( "HOHrp2Ene" , "HOHrp2Ene", 12000, -20 , 100 ); - HOHrp2Time = fs->make( "HOHrp2Time", "HOHrp2Time", 200, -200, 200 ); - - HBTvsE = fs->make( "HBTvsE", "HBTvsE",305, -5, 300, 100, -100, 100); - HETvsE = fs->make( "HETvsE", "HETvsE",305, -5, 300, 100, -100, 100); - - HFTvsE = fs->make( "HFTvsE", "HFTvsE",305, -5, 300, 100, -100, 100); - HFTvsEFlagged = fs->make( "HFTvsEFlagged", "HFTvsEFlagged",305, -5, 300, 100, -100, 100); - HFTvsEFlagged2 = fs->make( "HFTvsEFlagged2", "HFTvsEFlagged2",305, -5, 300, 100, -100, 100); - - HFTvsEThr = fs->make( "HFTvsEThr", "HFTvsEThr",305, -5, 300, 100, -100, 100); - HFTvsEFlaggedThr = fs->make( "HFTvsEFlaggedThr", "HFTvsEFlaggedThr",305, -5, 300, 100, -100, 100); - HFTvsEFlagged2Thr = fs->make( "HFTvsEFlagged2Thr", "HFTvsEFlagged2Thr",305, -5, 300, 100, -100, 100); - - HOTvsE = fs->make( "HOTvsE", "HOTvsE",305, -5, 300, 100, -100, 100); - - HFvsZ = fs->make( "HFvsZ", "HFvsZ",100,-50,50,100,-50,50); - - - - HOocc = fs->make( "HOocc", "HOocc",85,-42.5,42.5,70,0.5,70.5); - HBocc = fs->make( "HBocc", "HBocc",85,-42.5,42.5,70,0.5,70.5); - HEocc = fs->make( "HEocc", "HEocc",85,-42.5,42.5,70,0.5,70.5); - HFocc = fs->make( "HFocc", "HFocc",85,-42.5,42.5,70,0.5,70.5); - HFoccTime = fs->make( "HFoccTime", "HFoccTime",85,-42.5,42.5,70,0.5,70.5); - HFoccFlagged = fs->make( "HFoccFlagged", "HFoccFlagged",85,-42.5,42.5,70,0.5,70.5); - HFoccFlagged2 = fs->make( "HFoccFlagged2", "HFoccFlagged2",85,-42.5,42.5,70,0.5,70.5); - - HFEtaPhiNFlagged = fs->make( "HFEtaPhiNFlagged", "HFEtaPhiNFlagged",85,-42.5,42.5,70,0.5,70.5); + HOSEne = fs->make("HOSEne", "HOSEne", 12000, -20, 100); + HOSTime = fs->make("HOSTime", "HOSTime", 200, -100, 100); + HOHEne = fs->make("HOHEne", "HOHEne", 12000, -20, 100); + HOHTime = fs->make("HOHTime", "HOHTime", 200, -100, 100); + + HOHr0Ene = fs->make("HOHr0Ene", "HOHr0Ene", 12000, -20, 100); + HOHr0Time = fs->make("HOHr0Time", "HOHr0Time", 200, -200, 200); + HOHrm1Ene = fs->make("HOHrm1Ene", "HOHrm1Ene", 12000, -20, 100); + HOHrm1Time = fs->make("HOHrm1Time", "HOHrm1Time", 200, -200, 200); + HOHrm2Ene = fs->make("HOHrm2Ene", "HOHrm2Ene", 12000, -20, 100); + HOHrm2Time = fs->make("HOHrm2Time", "HOHrm2Time", 200, -200, 200); + HOHrp1Ene = fs->make("HOHrp1Ene", "HOHrp1Ene", 12000, -20, 100); + HOHrp1Time = fs->make("HOHrp1Time", "HOHrp1Time", 200, -200, 200); + HOHrp2Ene = fs->make("HOHrp2Ene", "HOHrp2Ene", 12000, -20, 100); + HOHrp2Time = fs->make("HOHrp2Time", "HOHrp2Time", 200, -200, 200); + + HBTvsE = fs->make("HBTvsE", "HBTvsE", 305, -5, 300, 100, -100, 100); + HETvsE = fs->make("HETvsE", "HETvsE", 305, -5, 300, 100, -100, 100); + + HFTvsE = fs->make("HFTvsE", "HFTvsE", 305, -5, 300, 100, -100, 100); + HFTvsEFlagged = fs->make("HFTvsEFlagged", "HFTvsEFlagged", 305, -5, 300, 100, -100, 100); + HFTvsEFlagged2 = fs->make("HFTvsEFlagged2", "HFTvsEFlagged2", 305, -5, 300, 100, -100, 100); + + HFTvsEThr = fs->make("HFTvsEThr", "HFTvsEThr", 305, -5, 300, 100, -100, 100); + HFTvsEFlaggedThr = fs->make("HFTvsEFlaggedThr", "HFTvsEFlaggedThr", 305, -5, 300, 100, -100, 100); + HFTvsEFlagged2Thr = fs->make("HFTvsEFlagged2Thr", "HFTvsEFlagged2Thr", 305, -5, 300, 100, -100, 100); + + HOTvsE = fs->make("HOTvsE", "HOTvsE", 305, -5, 300, 100, -100, 100); + + HFvsZ = fs->make("HFvsZ", "HFvsZ", 100, -50, 50, 100, -50, 50); + + HOocc = fs->make("HOocc", "HOocc", 85, -42.5, 42.5, 70, 0.5, 70.5); + HBocc = fs->make("HBocc", "HBocc", 85, -42.5, 42.5, 70, 0.5, 70.5); + HEocc = fs->make("HEocc", "HEocc", 85, -42.5, 42.5, 70, 0.5, 70.5); + HFocc = fs->make("HFocc", "HFocc", 85, -42.5, 42.5, 70, 0.5, 70.5); + HFoccTime = fs->make("HFoccTime", "HFoccTime", 85, -42.5, 42.5, 70, 0.5, 70.5); + HFoccFlagged = fs->make("HFoccFlagged", "HFoccFlagged", 85, -42.5, 42.5, 70, 0.5, 70.5); + HFoccFlagged2 = fs->make("HFoccFlagged2", "HFoccFlagged2", 85, -42.5, 42.5, 70, 0.5, 70.5); + + HFEtaPhiNFlagged = fs->make("HFEtaPhiNFlagged", "HFEtaPhiNFlagged", 85, -42.5, 42.5, 70, 0.5, 70.5); // HFEtaFlagged = fs->make( "HFEtaFlagged", "HFEtaFlagged",85,-42.5,42.5,0, 10000); - HFEtaFlagged = fs->make( "HFEtaFlagged", "HFEtaFlagged",85,-42.5,42.5); - HFEtaFlaggedL = fs->make( "HFEtaFlaggedL", "HFEtaFlaggedL",85,-42.5,42.5); - HFEtaFlaggedLN = fs->make( "HFEtaFlaggedLN", "HFEtaFlaggedLN",85,-42.5,42.5); - HFEtaFlaggedS = fs->make( "HFEtaFlaggedS", "HFEtaFlaggedS",85,-42.5,42.5); - HFEtaFlaggedSN = fs->make( "HFEtaFlaggedSN", "HFEtaFlaggedSN",85,-42.5,42.5); - - HFEtaNFlagged = fs->make( "HFEtaNFlagged", "HFEtaNFlagged",85,-42.5,42.5,0, 10000); - - HOoccOOT = fs->make( "HOoccOOT", "HOoccOOT",85,-42.5,42.5,70,0.5,70.5); - HBoccOOT = fs->make( "HBoccOOT", "HBoccOOT",85,-42.5,42.5,70,0.5,70.5); - HEoccOOT = fs->make( "HEoccOOT", "HEoccOOT",85,-42.5,42.5,70,0.5,70.5); - HFoccOOT = fs->make( "HFoccOOT", "HFoccOOT",85,-42.5,42.5,70,0.5,70.5); - - HFEnePMT0 = fs->make( "HFEnePMT0", "HFEnePMT0", 210, -10, 200 ); - HFEnePMT1 = fs->make( "HFEnePMT1", "HFEnePMT1", 210, -10, 200 ); - HFEnePMT2 = fs->make( "HFEnePMT2", "HFEnePMT2", 210, -10, 200 ); - HFTimePMT0 = fs->make( "HFTimePMT0", "HFTimePMT0", 200, -100, 100 ); - HFTimePMT1 = fs->make( "HFTimePMT1", "HFTimePMT1", 200, -100, 100 ); - HFTimePMT2 = fs->make( "HFTimePMT2", "HFTimePMT2", 200, -100, 100 ); - - HFEne = fs->make( "HFEne", "HFEne", 210, -10, 200 ); - HFEneFlagged = fs->make( "HFEneFlagged", "HFEneFlagged", 210, -10, 200 ); - HFEneFlagged2 = fs->make( "HFEneFlagged2", "HFEneFlagged2", 210, -10, 200 ); - HFEneTh = fs->make( "HFEneTh", "HFEneTh", 210, -10, 200 ); - HFEneTh1 = fs->make( "HFEneTh1", "HFEneTh1", 210, -10, 200 ); - HFEneP = fs->make( "HFEneP", "HFEneP", 200, -5, 10 ); - HFEneM = fs->make( "HFEneM", "HFEneM", 200, -5, 10 ); - HFTime = fs->make( "HFTime", "HFTime", 200, -100, 100 ); - PMTHits = fs->make( "PMTHits", "PMTHits", 10, 0, 10 ); - HFTimeFlagged = fs->make( "HFTimeFlagged", "HFTimeFlagged", 200, -100, 100 ); - - HFTimeFlagged2 = fs->make( "HFTimeFlagged2", "HFTimeFlagged2", 200, -100, 100 ); - HFTimeThFlagged2 = fs->make( "HFTimeThFlagged2", "HFTimeThFlagged2", 200, -100, 100 ); - HFTimeTh1Flagged2 = fs->make( "HFTimeTh1Flagged2", "HFTimeTh1Flagged2", 200, -100, 100 ); - HFTimeTh2Flagged2 = fs->make( "HFTimeTh2Flagged2", "HFTimeTh2Flagged2", 200, -100, 100 ); - HFTimeTh3Flagged2 = fs->make( "HFTimeTh3Flagged2", "HFTimeTh3Flagged2", 200, -100, 100 ); - - HFTimeFlagged3 = fs->make( "HFTimeFlagged3", "HFTimeFlagged3", 200, -100, 100 ); - HFTimeThFlagged3 = fs->make( "HFTimeThFlagged3", "HFTimeThFlagged3", 200, -100, 100 ); - HFTimeTh1Flagged3 = fs->make( "HFTimeTh1Flagged3", "HFTimeTh1Flagged3", 200, -100, 100 ); - HFTimeTh2Flagged3 = fs->make( "HFTimeTh2Flagged3", "HFTimeTh2Flagged3", 200, -100, 100 ); - HFTimeTh3Flagged3 = fs->make( "HFTimeTh3Flagged3", "HFTimeTh3Flagged3", 200, -100, 100 ); - - HFTimeThFlagged = fs->make( "HFTimeThFlagged", "HFTimeThFlagged", 200, -100, 100 ); - HFTimeTh2Flagged = fs->make( "HFTimeTh2Flagged", "HFTimeTh2Flagged", 200, -100, 100 ); - HFTimeTh3Flagged = fs->make( "HFTimeTh3Flagged", "HFTimeTh3Flagged", 200, -100, 100 ); - - HFTimeThFlaggedR = fs->make( "HFTimeThFlaggedR", "HFTimeThFlaggedR", 200, -100, 100 ); - HFTimeThFlaggedR1 = fs->make( "HFTimeThFlaggedR1", "HFTimeThFlaggedR1", 200, -100, 100 ); - HFTimeThFlaggedR2 = fs->make( "HFTimeThFlaggedR2", "HFTimeThFlaggedR2", 200, -100, 100 ); - HFTimeThFlaggedR3 = fs->make( "HFTimeThFlaggedR3", "HFTimeThFlaggedR3", 200, -100, 100 ); - HFTimeThFlaggedR4 = fs->make( "HFTimeThFlaggedR4", "HFTimeThFlaggedR4", 200, -100, 100 ); - HFTimeThFlaggedRM = fs->make( "HFTimeThFlaggedRM", "HFTimeThFlaggedRM", 200, -100, 100 ); - TrkMultFlagged0 = fs->make( "TrkMultFlagged0", "TrkMultFlagged0", 100, 0, 100 ); - TrkMultFlagged1 = fs->make( "TrkMultFlagged1", "TrkMultFlagged1", 100, 0, 100 ); - TrkMultFlagged2 = fs->make( "TrkMultFlagged2", "TrkMultFlagged2", 100, 0, 100 ); - TrkMultFlagged3 = fs->make( "TrkMultFlagged3", "TrkMultFlagged3", 100, 0, 100 ); - TrkMultFlagged4 = fs->make( "TrkMultFlagged4", "TrkMultFlagged4", 100, 0, 100 ); - TrkMultFlaggedM = fs->make( "TrkMultFlaggedM", "TrkMultFlaggedM", 100, 0, 100 ); - HFTimeTh = fs->make( "HFTimeTh", "HFTimeTh", 200, -100, 100 ); - HFTimeTh1 = fs->make( "HFTimeTh1", "HFTimeTh1", 200, -100, 100 ); - HFTimeTh2 = fs->make( "HFTimeTh2", "HFTimeTh2", 200, -100, 100 ); - HFTimeTh3 = fs->make( "HFTimeTh3", "HFTimeTh3", 200, -100, 100 ); - HFTimeThR = fs->make( "HFTimeThR", "HFTimeThR", 200, -100, 100 ); - HFTimeTh1R = fs->make( "HFTimeTh1R", "HFTimeTh1R", 200, -100, 100 ); - HFTimeTh2R = fs->make( "HFTimeTh2R", "HFTimeTh2R", 200, -100, 100 ); - HFTimeTh3R = fs->make( "HFTimeTh3R", "HFTimeTh3R", 200, -100, 100 ); - HFTimeP = fs->make( "HFTimeP", "HFTimeP", 100, -100, 50 ); - HFTimeM = fs->make( "HFTimeM", "HFTimeM", 100, -100, 50 ); - HFTimePMa = fs->make( "HFTimePMa", "HFTimePMa", 100, -100, 100 ); - HFTimePM = fs->make( "HFTimePM", "HFTimePM", 100, -100, 100 ); + HFEtaFlagged = fs->make("HFEtaFlagged", "HFEtaFlagged", 85, -42.5, 42.5); + HFEtaFlaggedL = fs->make("HFEtaFlaggedL", "HFEtaFlaggedL", 85, -42.5, 42.5); + HFEtaFlaggedLN = fs->make("HFEtaFlaggedLN", "HFEtaFlaggedLN", 85, -42.5, 42.5); + HFEtaFlaggedS = fs->make("HFEtaFlaggedS", "HFEtaFlaggedS", 85, -42.5, 42.5); + HFEtaFlaggedSN = fs->make("HFEtaFlaggedSN", "HFEtaFlaggedSN", 85, -42.5, 42.5); + + HFEtaNFlagged = fs->make("HFEtaNFlagged", "HFEtaNFlagged", 85, -42.5, 42.5, 0, 10000); + + HOoccOOT = fs->make("HOoccOOT", "HOoccOOT", 85, -42.5, 42.5, 70, 0.5, 70.5); + HBoccOOT = fs->make("HBoccOOT", "HBoccOOT", 85, -42.5, 42.5, 70, 0.5, 70.5); + HEoccOOT = fs->make("HEoccOOT", "HEoccOOT", 85, -42.5, 42.5, 70, 0.5, 70.5); + HFoccOOT = fs->make("HFoccOOT", "HFoccOOT", 85, -42.5, 42.5, 70, 0.5, 70.5); + + HFEnePMT0 = fs->make("HFEnePMT0", "HFEnePMT0", 210, -10, 200); + HFEnePMT1 = fs->make("HFEnePMT1", "HFEnePMT1", 210, -10, 200); + HFEnePMT2 = fs->make("HFEnePMT2", "HFEnePMT2", 210, -10, 200); + HFTimePMT0 = fs->make("HFTimePMT0", "HFTimePMT0", 200, -100, 100); + HFTimePMT1 = fs->make("HFTimePMT1", "HFTimePMT1", 200, -100, 100); + HFTimePMT2 = fs->make("HFTimePMT2", "HFTimePMT2", 200, -100, 100); + + HFEne = fs->make("HFEne", "HFEne", 210, -10, 200); + HFEneFlagged = fs->make("HFEneFlagged", "HFEneFlagged", 210, -10, 200); + HFEneFlagged2 = fs->make("HFEneFlagged2", "HFEneFlagged2", 210, -10, 200); + HFEneTh = fs->make("HFEneTh", "HFEneTh", 210, -10, 200); + HFEneTh1 = fs->make("HFEneTh1", "HFEneTh1", 210, -10, 200); + HFEneP = fs->make("HFEneP", "HFEneP", 200, -5, 10); + HFEneM = fs->make("HFEneM", "HFEneM", 200, -5, 10); + HFTime = fs->make("HFTime", "HFTime", 200, -100, 100); + PMTHits = fs->make("PMTHits", "PMTHits", 10, 0, 10); + HFTimeFlagged = fs->make("HFTimeFlagged", "HFTimeFlagged", 200, -100, 100); + + HFTimeFlagged2 = fs->make("HFTimeFlagged2", "HFTimeFlagged2", 200, -100, 100); + HFTimeThFlagged2 = fs->make("HFTimeThFlagged2", "HFTimeThFlagged2", 200, -100, 100); + HFTimeTh1Flagged2 = fs->make("HFTimeTh1Flagged2", "HFTimeTh1Flagged2", 200, -100, 100); + HFTimeTh2Flagged2 = fs->make("HFTimeTh2Flagged2", "HFTimeTh2Flagged2", 200, -100, 100); + HFTimeTh3Flagged2 = fs->make("HFTimeTh3Flagged2", "HFTimeTh3Flagged2", 200, -100, 100); + + HFTimeFlagged3 = fs->make("HFTimeFlagged3", "HFTimeFlagged3", 200, -100, 100); + HFTimeThFlagged3 = fs->make("HFTimeThFlagged3", "HFTimeThFlagged3", 200, -100, 100); + HFTimeTh1Flagged3 = fs->make("HFTimeTh1Flagged3", "HFTimeTh1Flagged3", 200, -100, 100); + HFTimeTh2Flagged3 = fs->make("HFTimeTh2Flagged3", "HFTimeTh2Flagged3", 200, -100, 100); + HFTimeTh3Flagged3 = fs->make("HFTimeTh3Flagged3", "HFTimeTh3Flagged3", 200, -100, 100); + + HFTimeThFlagged = fs->make("HFTimeThFlagged", "HFTimeThFlagged", 200, -100, 100); + HFTimeTh2Flagged = fs->make("HFTimeTh2Flagged", "HFTimeTh2Flagged", 200, -100, 100); + HFTimeTh3Flagged = fs->make("HFTimeTh3Flagged", "HFTimeTh3Flagged", 200, -100, 100); + + HFTimeThFlaggedR = fs->make("HFTimeThFlaggedR", "HFTimeThFlaggedR", 200, -100, 100); + HFTimeThFlaggedR1 = fs->make("HFTimeThFlaggedR1", "HFTimeThFlaggedR1", 200, -100, 100); + HFTimeThFlaggedR2 = fs->make("HFTimeThFlaggedR2", "HFTimeThFlaggedR2", 200, -100, 100); + HFTimeThFlaggedR3 = fs->make("HFTimeThFlaggedR3", "HFTimeThFlaggedR3", 200, -100, 100); + HFTimeThFlaggedR4 = fs->make("HFTimeThFlaggedR4", "HFTimeThFlaggedR4", 200, -100, 100); + HFTimeThFlaggedRM = fs->make("HFTimeThFlaggedRM", "HFTimeThFlaggedRM", 200, -100, 100); + TrkMultFlagged0 = fs->make("TrkMultFlagged0", "TrkMultFlagged0", 100, 0, 100); + TrkMultFlagged1 = fs->make("TrkMultFlagged1", "TrkMultFlagged1", 100, 0, 100); + TrkMultFlagged2 = fs->make("TrkMultFlagged2", "TrkMultFlagged2", 100, 0, 100); + TrkMultFlagged3 = fs->make("TrkMultFlagged3", "TrkMultFlagged3", 100, 0, 100); + TrkMultFlagged4 = fs->make("TrkMultFlagged4", "TrkMultFlagged4", 100, 0, 100); + TrkMultFlaggedM = fs->make("TrkMultFlaggedM", "TrkMultFlaggedM", 100, 0, 100); + HFTimeTh = fs->make("HFTimeTh", "HFTimeTh", 200, -100, 100); + HFTimeTh1 = fs->make("HFTimeTh1", "HFTimeTh1", 200, -100, 100); + HFTimeTh2 = fs->make("HFTimeTh2", "HFTimeTh2", 200, -100, 100); + HFTimeTh3 = fs->make("HFTimeTh3", "HFTimeTh3", 200, -100, 100); + HFTimeThR = fs->make("HFTimeThR", "HFTimeThR", 200, -100, 100); + HFTimeTh1R = fs->make("HFTimeTh1R", "HFTimeTh1R", 200, -100, 100); + HFTimeTh2R = fs->make("HFTimeTh2R", "HFTimeTh2R", 200, -100, 100); + HFTimeTh3R = fs->make("HFTimeTh3R", "HFTimeTh3R", 200, -100, 100); + HFTimeP = fs->make("HFTimeP", "HFTimeP", 100, -100, 50); + HFTimeM = fs->make("HFTimeM", "HFTimeM", 100, -100, 50); + HFTimePMa = fs->make("HFTimePMa", "HFTimePMa", 100, -100, 100); + HFTimePM = fs->make("HFTimePM", "HFTimePM", 100, -100, 100); // Histos for separating HF long/short fibers: - HFLEneAll = fs->make( "HFLEneAll", "HFLEneAll", 210, -10, 200 ); - HFLEneAllF = fs->make( "HFLEneAllF", "HFLEneAllF", 210, -10, 200 ); - HFSEneAll = fs->make( "HFSEneAll", "HFSEneAll", 210, -10, 200 ); - HFSEneAllF = fs->make( "HFSEneAllF", "HFSEneAllF", 210, -10, 200 ); - HFLEne = fs->make( "HFLEne", "HFLEne", 200, -5, 10 ); - HFLTime = fs->make( "HFLTime", "HFLTime", 200, -100, 100 ); - HFSEne = fs->make( "HFSEne", "HFSEne", 200, -5, 10 ); - HFSTime = fs->make( "HFSTime", "HFSTime", 200, -100, 100 ); - HFLSRatio = fs->make( "HFLSRatio", "HFLSRatio", 220, -1.1, 1.1 ); - - HFOERatio = fs->make( "HFOERatio", "HFOERatio", 2200, -1.1, 1.1 ); - - HFLvsS = fs->make( "HFLvsS", "HFLvsS",220,-20,200,220,-20,200); - HFLEneNoS = fs->make( "HFLEneNoS", "HFLEneNoS", 205, -5, 200 ); - HFSEneNoL = fs->make( "HFSEneNoL", "HFSEneNoL", 205, -5, 200 ); - HFLEneNoSFlagged = fs->make( "HFLEneNoSFlagged", "HFLEneNoSFlagged", 205, -5, 200 ); - HFSEneNoLFlagged = fs->make( "HFSEneNoLFlagged", "HFSEneNoLFlagged", 205, -5, 200 ); - HFLEneNoSFlaggedN = fs->make( "HFLEneNoSFlaggedN", "HFLEneNoSFlaggedN", 205, -5, 200 ); - HFSEneNoLFlaggedN = fs->make( "HFSEneNoLFlaggedN", "HFSEneNoLFlaggedN", 205, -5, 200 ); - - - EBEne = fs->make( "EBEne", "EBEne", 200, -5, 10 ); - EBEneTh = fs->make( "EBEneTh", "EBEneTh", 200, -5, 10 ); - EBEneX = fs->make( "EBEneX", "EBEneX", 200, -5, 10 ); - EBEneY = fs->make( "EBEneY", "EBEneY", 200, -5, 10 ); - EBTime = fs->make( "EBTime", "EBTime", 200, -100, 100 ); - EBTimeTh = fs->make( "EBTimeTh", "EBTimeTh", 200, -100, 100 ); - EBTimeX = fs->make( "EBTimeX", "EBTimeX", 200, -100, 100 ); - EBTimeY = fs->make( "EBTimeY", "EBTimeY", 200, -100, 100 ); - EEEne = fs->make( "EEEne", "EEEne", 200, -5, 10 ); - EEEneTh = fs->make( "EEEneTh", "EEEneTh", 200, -5, 10 ); - EEEneX = fs->make( "EEEneX", "EEEneX", 200, -5, 10 ); - EEEneY = fs->make( "EEEneY", "EEEneY", 200, -5, 10 ); - EEnegEne = fs->make( "EEnegEne", "EEnegEne", 200, -5, 10 ); - EEposEne = fs->make( "EEposEne", "EEposEne", 200, -5, 10 ); - EETime = fs->make( "EETime", "EETime", 200, -100, 100 ); - EETimeTh = fs->make( "EETimeTh", "EETimeTh", 200, -100, 100 ); - EETimeX = fs->make( "EETimeX", "EETimeX", 200, -100, 100 ); - EETimeY = fs->make( "EETimeY", "EETimeY", 200, -100, 100 ); - EEnegTime = fs->make( "EEnegTime", "EEnegTime", 200, -100, 100 ); - EEposTime = fs->make( "EEposTime", "EEposTime", 200, -100, 100 ); - - h_nTowersCal = fs->make( "nTowersCal", "N Towers in Jet", 100, 0, 50 ); - h_EMFracCal = fs->make( "EMFracCal", "EM Fraction in Jet", 100, -1.1, 1.1 ); - h_ptCal = fs->make( "ptCal", "p_{T} of CalJet", 100, 0, 50 ); - h_etaCal = fs->make( "etaCal", "#eta of CalJet", 100, -4, 4 ); - h_phiCal = fs->make( "phiCal", "#phi of CalJet", 50, -M_PI, M_PI ); - - h_nGenJets = fs->make( "nGenJets", "Number of GenJets", 20, 0, 20 ); - - h_ptGen = fs->make( "ptGen", "p_{T} of GenJet", 100, 0, 50 ); - h_etaGen = fs->make( "etaGen", "#eta of GenJet", 100, -4, 4 ); - h_phiGen = fs->make( "phiGen", "#phi of GenJet", 50, -M_PI, M_PI ); - - h_ptGenL = fs->make( "ptGenL", "p_{T} of GenJetL", 100, 0, 50 ); - h_etaGenL = fs->make( "etaGenL", "#eta of GenJetL", 100, -4, 4 ); - h_phiGenL = fs->make( "phiGenL", "#phi of GenJetL", 50, -M_PI, M_PI ); - - h_jetEt = fs->make( "jetEt", "Total Jet Et", 100, 0, 3000 ); - - h_jet1Pt = fs->make( "jet1Pt", "Jet1 Pt", 100, 0, 1000 ); - h_jet2Pt = fs->make( "jet2Pt", "Jet2 Pt", 100, 0, 1000 ); - h_jet1Eta = fs->make( "jet1Eta", "Jet1 Eta", 50, -5, 5 ); - h_jet2Eta = fs->make( "jet2Eta", "Jet2 Eta", 50, -5, 5 ); - h_jet1PtHLT = fs->make( "jet1PtHLT", "Jet1 Pt HLT", 100, 0, 1000 ); - - h_TotalUnclusteredEt = fs->make( "TotalUnclusteredEt", "Total Unclustered Et", 100, 0, 500 ); - h_UnclusteredEt = fs->make( "UnclusteredEt", "Unclustered Et", 100, 0, 50 ); - h_UnclusteredEts = fs->make( "UnclusteredEts", "Unclustered Et", 100, 0, 2 ); - - h_ClusteredE = fs->make( "ClusteredE", "Clustered E", 200, 0, 20 ); - h_TotalClusteredE = fs->make( "TotalClusteredE", "Total Clustered E", 200, 0, 100 ); - h_UnclusteredE = fs->make( "UnclusteredE", "Unclustered E", 200, 0, 20 ); - h_TotalUnclusteredE = fs->make( "TotalUnclusteredE", "Total Unclustered E", 200, 0, 100 ); - - jetHOEne = fs->make("jetHOEne" ,"HO Energy in Jet",100, 0,100); - jetEMFraction = fs->make( "jetEMFraction", "Jet EM Fraction", 100, -1.1, 1.1 ); - NTowers = fs->make( "NTowers", "Number of Towers", 100, 0, 100 ); - - - h_EmEnergy = fs->make( "EmEnergy", "Em Energy", 90, -45, 45, 73, 0, 73 ); - h_HadEnergy = fs->make( "HadEnergy", "Had Energy", 90, -45, 45, 73, 0, 73 ); - - st_Pt = fs->make( "st_Pt", "Pt", 200, 0, 200 ); - st_Constituents = fs->make( "st_Constituents", "Constituents", 200, 0, 200 ); - st_Energy = fs->make( "st_Energy", "Tower Energy", 200, 0, 200 ); - st_EmEnergy = fs->make( "st_EmEnergy", "Tower EmEnergy", 200, 0, 200 ); - st_HadEnergy = fs->make( "st_HadEnergy", "Tower HadEnergy", 200, 0, 200 ); - st_OuterEnergy = fs->make( "st_OuterEnergy", "Tower OuterEnergy", 200, 0, 200 ); - st_Eta = fs->make( "st_Eta", "Eta", 100, -4, 4 ); - st_Phi = fs->make( "st_Phi", "Phi", 50, -M_PI, M_PI ); - st_iEta = fs->make( "st_iEta", "iEta", 60, -30, 30 ); - st_iPhi = fs->make( "st_iPhi", "iPhi", 80, 0, 80 ); - st_Frac = fs->make( "st_Frac", "Frac", 100, 0, 1 ); - - - EBvHB = fs->make( "EBvHB", "EB vs HB",1000,0,4500000.,1000,0,1000000.); - EEvHE = fs->make( "EEvHE", "EE vs HE",1000,0,4500000.,1000,0,200000.); - - ECALvHCAL = fs->make( "ECALvHCAL", "ECAL vs HCAL",100,0,20000000.,100,-500000,500000.); - ECALvHCALEta1 = fs->make( "ECALvHCALEta1", "ECAL vs HCALEta1",100,0,20000000.,100,-500000,500000.); - ECALvHCALEta2 = fs->make( "ECALvHCALEta2", "ECAL vs HCALEta2",100,0,20000000.,100,-500000,500000.); - ECALvHCALEta3 = fs->make( "ECALvHCALEta3", "ECAL vs HCALEta3",100,0,20000000.,100,-500000,500000.); - - EMF_Eta = fs->make("EMF_Eta","EMF Eta", 100, -50, 50, 0, 10); - EMF_Phi = fs->make("EMF_Phi","EMF Phi", 100, 0, 100, 0, 10); - EMF_EtaX = fs->make("EMF_EtaX","EMF EtaX", 100, -50, 50, 0, 10); - EMF_PhiX = fs->make("EMF_PhiX","EMF PhiX", 100, 0, 100, 0, 10); - - HFTimeVsiEtaP = fs->make("HFTimeVsiEtaP","HFTimeVsiEtaP", 13, 28.5, 41.5, -100, 100); - HFTimeVsiEtaM = fs->make("HFTimeVsiEtaM","HFTimeVsiEtaM", 13, -41.5, -28.5, -100, 100); - - HFTimeVsiEtaP5 = fs->make("HFTimeVsiEtaP5","HFTimeVsiEtaP5", 13, 28.5, 41.5, -100, 100); - HFTimeVsiEtaM5 = fs->make("HFTimeVsiEtaM5","HFTimeVsiEtaM5", 13, -41.5, -28.5, -100, 100); - - HFTimeVsiEtaP20 = fs->make("HFTimeVsiEtaP20","HFTimeVsiEtaP20", 13, 28.5, 41.5, -100, 100); - HFTimeVsiEtaM20 = fs->make("HFTimeVsiEtaM20","HFTimeVsiEtaM20", 13, -41.5, -28.5, -100, 100); - - NPass = fs->make( "NPass", "NPass", 3, -1, 1 ); - NTotal = fs->make( "NTotal", "NTotal", 3, -1, 1 ); - NTime = fs->make( "NTime", "NTime", 10, 0, 10 ); - - - HFRecHitEne = fs->make( "HFRecHitEne", "HFRecHitEne", 300, 0, 3000 ); - HFRecHitEneClean = fs->make( "HFRecHitEneClean", "HFRecHitEneClean", 300, 0, 3000 ); - HFRecHitTime = fs->make( "HFRecHitTime", "HFRecHitTime", 120, -60, 60 ); - - - HFLongShortPhi = fs->make( "HFLongShortPhi", "HFLongShortPhi", 73, 0, 73 ); - HFLongShortEta = fs->make( "HFLongShortEta", "HFLongShortEta", 90, -45, 45 ); - HFLongShortEne = fs->make( "HFLongShortEne", "HFLongShortEne", 300, 0, 3000 ); - HFLongShortTime = fs->make( "HFLongShortTime", "HFLongShortTime", 120, -60, 60 ); - HFLongShortNHits = fs->make( "HFLongShortNHits", "HFLongShortNHits", 30, 0, 30 ); - - HFDigiTimePhi = fs->make( "HFDigiTimePhi", "HFDigiTimePhi", 73, 0, 73 ); - HFDigiTimeEta = fs->make( "HFDigiTimeEta", "HFDigiTimeEta", 90, -45, 45 ); - HFDigiTimeEne = fs->make( "HFDigiTimeEne", "HFDigiTimeEne", 300, 0, 3000 ); - HFDigiTimeTime = fs->make( "HFDigiTimeTime", "HFDigiTimeTime", 120, -60, 60 ); - HFDigiTimeNHits = fs->make( "HFDigiTimeNHits", "HFDigiTimeNHits", 30, 0, 30 ); + HFLEneAll = fs->make("HFLEneAll", "HFLEneAll", 210, -10, 200); + HFLEneAllF = fs->make("HFLEneAllF", "HFLEneAllF", 210, -10, 200); + HFSEneAll = fs->make("HFSEneAll", "HFSEneAll", 210, -10, 200); + HFSEneAllF = fs->make("HFSEneAllF", "HFSEneAllF", 210, -10, 200); + HFLEne = fs->make("HFLEne", "HFLEne", 200, -5, 10); + HFLTime = fs->make("HFLTime", "HFLTime", 200, -100, 100); + HFSEne = fs->make("HFSEne", "HFSEne", 200, -5, 10); + HFSTime = fs->make("HFSTime", "HFSTime", 200, -100, 100); + HFLSRatio = fs->make("HFLSRatio", "HFLSRatio", 220, -1.1, 1.1); + + HFOERatio = fs->make("HFOERatio", "HFOERatio", 2200, -1.1, 1.1); + + HFLvsS = fs->make("HFLvsS", "HFLvsS", 220, -20, 200, 220, -20, 200); + HFLEneNoS = fs->make("HFLEneNoS", "HFLEneNoS", 205, -5, 200); + HFSEneNoL = fs->make("HFSEneNoL", "HFSEneNoL", 205, -5, 200); + HFLEneNoSFlagged = fs->make("HFLEneNoSFlagged", "HFLEneNoSFlagged", 205, -5, 200); + HFSEneNoLFlagged = fs->make("HFSEneNoLFlagged", "HFSEneNoLFlagged", 205, -5, 200); + HFLEneNoSFlaggedN = fs->make("HFLEneNoSFlaggedN", "HFLEneNoSFlaggedN", 205, -5, 200); + HFSEneNoLFlaggedN = fs->make("HFSEneNoLFlaggedN", "HFSEneNoLFlaggedN", 205, -5, 200); + + EBEne = fs->make("EBEne", "EBEne", 200, -5, 10); + EBEneTh = fs->make("EBEneTh", "EBEneTh", 200, -5, 10); + EBEneX = fs->make("EBEneX", "EBEneX", 200, -5, 10); + EBEneY = fs->make("EBEneY", "EBEneY", 200, -5, 10); + EBTime = fs->make("EBTime", "EBTime", 200, -100, 100); + EBTimeTh = fs->make("EBTimeTh", "EBTimeTh", 200, -100, 100); + EBTimeX = fs->make("EBTimeX", "EBTimeX", 200, -100, 100); + EBTimeY = fs->make("EBTimeY", "EBTimeY", 200, -100, 100); + EEEne = fs->make("EEEne", "EEEne", 200, -5, 10); + EEEneTh = fs->make("EEEneTh", "EEEneTh", 200, -5, 10); + EEEneX = fs->make("EEEneX", "EEEneX", 200, -5, 10); + EEEneY = fs->make("EEEneY", "EEEneY", 200, -5, 10); + EEnegEne = fs->make("EEnegEne", "EEnegEne", 200, -5, 10); + EEposEne = fs->make("EEposEne", "EEposEne", 200, -5, 10); + EETime = fs->make("EETime", "EETime", 200, -100, 100); + EETimeTh = fs->make("EETimeTh", "EETimeTh", 200, -100, 100); + EETimeX = fs->make("EETimeX", "EETimeX", 200, -100, 100); + EETimeY = fs->make("EETimeY", "EETimeY", 200, -100, 100); + EEnegTime = fs->make("EEnegTime", "EEnegTime", 200, -100, 100); + EEposTime = fs->make("EEposTime", "EEposTime", 200, -100, 100); + + h_nTowersCal = fs->make("nTowersCal", "N Towers in Jet", 100, 0, 50); + h_EMFracCal = fs->make("EMFracCal", "EM Fraction in Jet", 100, -1.1, 1.1); + h_ptCal = fs->make("ptCal", "p_{T} of CalJet", 100, 0, 50); + h_etaCal = fs->make("etaCal", "#eta of CalJet", 100, -4, 4); + h_phiCal = fs->make("phiCal", "#phi of CalJet", 50, -M_PI, M_PI); + + h_nGenJets = fs->make("nGenJets", "Number of GenJets", 20, 0, 20); + + h_ptGen = fs->make("ptGen", "p_{T} of GenJet", 100, 0, 50); + h_etaGen = fs->make("etaGen", "#eta of GenJet", 100, -4, 4); + h_phiGen = fs->make("phiGen", "#phi of GenJet", 50, -M_PI, M_PI); + + h_ptGenL = fs->make("ptGenL", "p_{T} of GenJetL", 100, 0, 50); + h_etaGenL = fs->make("etaGenL", "#eta of GenJetL", 100, -4, 4); + h_phiGenL = fs->make("phiGenL", "#phi of GenJetL", 50, -M_PI, M_PI); + + h_jetEt = fs->make("jetEt", "Total Jet Et", 100, 0, 3000); + + h_jet1Pt = fs->make("jet1Pt", "Jet1 Pt", 100, 0, 1000); + h_jet2Pt = fs->make("jet2Pt", "Jet2 Pt", 100, 0, 1000); + h_jet1Eta = fs->make("jet1Eta", "Jet1 Eta", 50, -5, 5); + h_jet2Eta = fs->make("jet2Eta", "Jet2 Eta", 50, -5, 5); + h_jet1PtHLT = fs->make("jet1PtHLT", "Jet1 Pt HLT", 100, 0, 1000); + + h_TotalUnclusteredEt = fs->make("TotalUnclusteredEt", "Total Unclustered Et", 100, 0, 500); + h_UnclusteredEt = fs->make("UnclusteredEt", "Unclustered Et", 100, 0, 50); + h_UnclusteredEts = fs->make("UnclusteredEts", "Unclustered Et", 100, 0, 2); + + h_ClusteredE = fs->make("ClusteredE", "Clustered E", 200, 0, 20); + h_TotalClusteredE = fs->make("TotalClusteredE", "Total Clustered E", 200, 0, 100); + h_UnclusteredE = fs->make("UnclusteredE", "Unclustered E", 200, 0, 20); + h_TotalUnclusteredE = fs->make("TotalUnclusteredE", "Total Unclustered E", 200, 0, 100); + + jetHOEne = fs->make("jetHOEne", "HO Energy in Jet", 100, 0, 100); + jetEMFraction = fs->make("jetEMFraction", "Jet EM Fraction", 100, -1.1, 1.1); + NTowers = fs->make("NTowers", "Number of Towers", 100, 0, 100); + + h_EmEnergy = fs->make("EmEnergy", "Em Energy", 90, -45, 45, 73, 0, 73); + h_HadEnergy = fs->make("HadEnergy", "Had Energy", 90, -45, 45, 73, 0, 73); + + st_Pt = fs->make("st_Pt", "Pt", 200, 0, 200); + st_Constituents = fs->make("st_Constituents", "Constituents", 200, 0, 200); + st_Energy = fs->make("st_Energy", "Tower Energy", 200, 0, 200); + st_EmEnergy = fs->make("st_EmEnergy", "Tower EmEnergy", 200, 0, 200); + st_HadEnergy = fs->make("st_HadEnergy", "Tower HadEnergy", 200, 0, 200); + st_OuterEnergy = fs->make("st_OuterEnergy", "Tower OuterEnergy", 200, 0, 200); + st_Eta = fs->make("st_Eta", "Eta", 100, -4, 4); + st_Phi = fs->make("st_Phi", "Phi", 50, -M_PI, M_PI); + st_iEta = fs->make("st_iEta", "iEta", 60, -30, 30); + st_iPhi = fs->make("st_iPhi", "iPhi", 80, 0, 80); + st_Frac = fs->make("st_Frac", "Frac", 100, 0, 1); + + EBvHB = fs->make("EBvHB", "EB vs HB", 1000, 0, 4500000., 1000, 0, 1000000.); + EEvHE = fs->make("EEvHE", "EE vs HE", 1000, 0, 4500000., 1000, 0, 200000.); + + ECALvHCAL = fs->make("ECALvHCAL", "ECAL vs HCAL", 100, 0, 20000000., 100, -500000, 500000.); + ECALvHCALEta1 = fs->make("ECALvHCALEta1", "ECAL vs HCALEta1", 100, 0, 20000000., 100, -500000, 500000.); + ECALvHCALEta2 = fs->make("ECALvHCALEta2", "ECAL vs HCALEta2", 100, 0, 20000000., 100, -500000, 500000.); + ECALvHCALEta3 = fs->make("ECALvHCALEta3", "ECAL vs HCALEta3", 100, 0, 20000000., 100, -500000, 500000.); + + EMF_Eta = fs->make("EMF_Eta", "EMF Eta", 100, -50, 50, 0, 10); + EMF_Phi = fs->make("EMF_Phi", "EMF Phi", 100, 0, 100, 0, 10); + EMF_EtaX = fs->make("EMF_EtaX", "EMF EtaX", 100, -50, 50, 0, 10); + EMF_PhiX = fs->make("EMF_PhiX", "EMF PhiX", 100, 0, 100, 0, 10); + + HFTimeVsiEtaP = fs->make("HFTimeVsiEtaP", "HFTimeVsiEtaP", 13, 28.5, 41.5, -100, 100); + HFTimeVsiEtaM = fs->make("HFTimeVsiEtaM", "HFTimeVsiEtaM", 13, -41.5, -28.5, -100, 100); + + HFTimeVsiEtaP5 = fs->make("HFTimeVsiEtaP5", "HFTimeVsiEtaP5", 13, 28.5, 41.5, -100, 100); + HFTimeVsiEtaM5 = fs->make("HFTimeVsiEtaM5", "HFTimeVsiEtaM5", 13, -41.5, -28.5, -100, 100); + + HFTimeVsiEtaP20 = fs->make("HFTimeVsiEtaP20", "HFTimeVsiEtaP20", 13, 28.5, 41.5, -100, 100); + HFTimeVsiEtaM20 = fs->make("HFTimeVsiEtaM20", "HFTimeVsiEtaM20", 13, -41.5, -28.5, -100, 100); + + NPass = fs->make("NPass", "NPass", 3, -1, 1); + NTotal = fs->make("NTotal", "NTotal", 3, -1, 1); + NTime = fs->make("NTime", "NTime", 10, 0, 10); + + HFRecHitEne = fs->make("HFRecHitEne", "HFRecHitEne", 300, 0, 3000); + HFRecHitEneClean = fs->make("HFRecHitEneClean", "HFRecHitEneClean", 300, 0, 3000); + HFRecHitTime = fs->make("HFRecHitTime", "HFRecHitTime", 120, -60, 60); + + HFLongShortPhi = fs->make("HFLongShortPhi", "HFLongShortPhi", 73, 0, 73); + HFLongShortEta = fs->make("HFLongShortEta", "HFLongShortEta", 90, -45, 45); + HFLongShortEne = fs->make("HFLongShortEne", "HFLongShortEne", 300, 0, 3000); + HFLongShortTime = fs->make("HFLongShortTime", "HFLongShortTime", 120, -60, 60); + HFLongShortNHits = fs->make("HFLongShortNHits", "HFLongShortNHits", 30, 0, 30); + + HFDigiTimePhi = fs->make("HFDigiTimePhi", "HFDigiTimePhi", 73, 0, 73); + HFDigiTimeEta = fs->make("HFDigiTimeEta", "HFDigiTimeEta", 90, -45, 45); + HFDigiTimeEne = fs->make("HFDigiTimeEne", "HFDigiTimeEne", 300, 0, 3000); + HFDigiTimeTime = fs->make("HFDigiTimeTime", "HFDigiTimeTime", 120, -60, 60); + HFDigiTimeNHits = fs->make("HFDigiTimeNHits", "HFDigiTimeNHits", 30, 0, 30); totBNC = 0; - for (int i=0; i<4000; i++) nBNC[i] = 0; - + for (int i = 0; i < 4000; i++) + nBNC[i] = 0; } // ************************ // ************************ -void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { - +void myJetAna::analyze(const edm::Event &evt, const edm::EventSetup &es) { using namespace edm; bool Pass, Pass_HFTime, Pass_DiJet, Pass_BunchCrossing, Pass_Vertex; @@ -604,27 +584,27 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { double towerEtCut, towerECut, towerE; towerEtCut = 1.0; - towerECut = 1.0; + towerECut = 1.0; unsigned int StableRun = 123732; double HBHEThreshold = 2.0; - double HFThreshold = 2.0; - double HOThreshold = 2.0; + double HFThreshold = 2.0; + double HOThreshold = 2.0; double EBEEThreshold = 2.0; double HBHEThreshold1 = 4.0; - double HFThreshold1 = 4.0; - double HOThreshold1 = 4.0; + double HFThreshold1 = 4.0; + double HOThreshold1 = 4.0; //double EBEEThreshold1 = 4.0; double HBHEThreshold2 = 10.0; - double HFThreshold2 = 10.0; + double HFThreshold2 = 10.0; //double HOThreshold2 = 10.0; //double EBEEThreshold2 = 10.0; double HBHEThreshold3 = 40.0; - double HFThreshold3 = 40.0; + double HFThreshold3 = 40.0; //double HOThreshold3 = 40.0; //double EBEEThreshold3 = 40.0; @@ -642,7 +622,6 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // Handle dcsStatus; // evt.getByLabel("dcsStatus", dcsStatus); - math::XYZTLorentzVector p4tmp[2], p4cortmp[2]; // -------------------------------------------------------------- @@ -674,19 +653,17 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // *** Pass Trigger // *********************** - // **** Get the TriggerResults container Handle triggerResults; evt.getByLabel(theTriggerResultsLabel, triggerResults); // evt.getByLabel("TriggerResults::HLT", triggerResults); if (triggerResults.isValid()) { - edm::LogInfo("myJetAna") << "trigger valid " ; + edm::LogInfo("myJetAna") << "trigger valid "; // edm::TriggerNames triggerNames; // TriggerNames class // triggerNames.init(*triggerResults); unsigned int n = triggerResults->size(); - for (unsigned int i=0; i!=n; i++) { - + for (unsigned int i = 0; i != n; i++) { /*** std::cout << ">>> Trigger Name (" << i << ") = " << triggerNames.triggerName(i) << " Accept = " << triggerResults->accept(i) @@ -702,30 +679,26 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // if (DEBUG) std::cout << triggerNames.triggerName(i) << std::endl; - // if ( (triggerNames.triggerName(i) == "HLT_ZeroBias") || - // (triggerNames.triggerName(i) == "HLT_MinBias") || + // if ( (triggerNames.triggerName(i) == "HLT_ZeroBias") || + // (triggerNames.triggerName(i) == "HLT_MinBias") || // (triggerNames.triggerName(i) == "HLT_MinBiasHcal") ) { - } - - } else { + } else { edm::Handle *tr = new edm::Handle; triggerResults = (*tr); // std::cout << "triggerResults is not valid" << std::endl; // std::cout << triggerResults << std::endl; // std::cout << triggerResults.isValid() << std::endl; - + edm::LogInfo("myJetAna") << "trigger not valid " << std::endl; edm::LogInfo("myJetAna") << "TriggerResults::HLT not found, " - "automatically select events"; + "automatically select events"; //return; } - - /*** Handle gtRecord; evt.getByLabel("gtDigis",gtRecord); @@ -733,62 +706,50 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { ***/ - // ************************* // *** Pass Bunch Crossing // ************************* // *** Check Luminosity Section if (evt.id().run() == 122294) - if ( (evt.luminosityBlock() >= 37) && (evt.luminosityBlock() <= 43) ) + if ((evt.luminosityBlock() >= 37) && (evt.luminosityBlock() <= 43)) Pass = true; if (evt.id().run() == 122314) - if ( (evt.luminosityBlock() >= 24) && (evt.luminosityBlock() <= 37) ) + if ((evt.luminosityBlock() >= 24) && (evt.luminosityBlock() <= 37)) Pass = true; if (evt.id().run() == 123575) - Pass = true; + Pass = true; if (evt.id().run() == 123596) - Pass = true; + Pass = true; // *********** if (evt.id().run() == 124009) { - if ( (evt.bunchCrossing() == 51) || - (evt.bunchCrossing() == 151) || - (evt.bunchCrossing() == 2824) ) { + if ((evt.bunchCrossing() == 51) || (evt.bunchCrossing() == 151) || (evt.bunchCrossing() == 2824)) { Pass = true; } } if (evt.id().run() == 124020) { - if ( (evt.bunchCrossing() == 51) || - (evt.bunchCrossing() == 151) || - (evt.bunchCrossing() == 2824) ) { + if ((evt.bunchCrossing() == 51) || (evt.bunchCrossing() == 151) || (evt.bunchCrossing() == 2824)) { Pass = true; } } if (evt.id().run() == 124024) { - if ( (evt.bunchCrossing() == 51) || - (evt.bunchCrossing() == 151) || - (evt.bunchCrossing() == 2824) ) { + if ((evt.bunchCrossing() == 51) || (evt.bunchCrossing() == 151) || (evt.bunchCrossing() == 2824)) { Pass = true; } } - if ( (evt.bunchCrossing() == 51) || - (evt.bunchCrossing() == 151) || - (evt.bunchCrossing() == 2596) || - (evt.bunchCrossing() == 2724) || - (evt.bunchCrossing() == 2824) || - (evt.bunchCrossing() == 3487) ) { + if ((evt.bunchCrossing() == 51) || (evt.bunchCrossing() == 151) || (evt.bunchCrossing() == 2596) || + (evt.bunchCrossing() == 2724) || (evt.bunchCrossing() == 2824) || (evt.bunchCrossing() == 3487)) { Pass_BunchCrossing = true; } else { Pass_BunchCrossing = false; } - // *********************** - // *** Pass HF Timing + // *** Pass HF Timing // *********************** double HFM_ETime, HFP_ETime; @@ -800,16 +761,15 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { HFP_ETime = 0.; HFP_E = 0.; - for (int i=0; i<100; i++) { - for (int j=0; j<100; j++) { + for (int i = 0; i < 100; i++) { + for (int j = 0; j < 100; j++) { HFRecHit[i][j][0] = -10.; HFRecHit[i][j][1] = -10.; - HFRecHitFlag[i][j][0] = 0; - HFRecHitFlag[i][j][1] = 0; + HFRecHitFlag[i][j][0] = 0; + HFRecHitFlag[i][j][1] = 0; } } - int nTime = 0; int NHFLongShortHits; int NHFDigiTimeHits; @@ -818,84 +778,79 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // edm::Handle vertexCollection; - std::vector > colls; - evt.getManyByType(colls); + std::vector > colls; + evt.getManyByType(colls); - std::vector >::iterator i; - for (i=colls.begin(); i!=colls.end(); i++) { - - for (HFRecHitCollection::const_iterator j=(*i)->begin(); j!=(*i)->end(); j++) { - if (j->id().subdet() == HcalForward) { + std::vector >::iterator i; + for (i = colls.begin(); i != colls.end(); i++) { + for (HFRecHitCollection::const_iterator j = (*i)->begin(); j != (*i)->end(); j++) { + if (j->id().subdet() == HcalForward) { + HFRecHitEne->Fill(j->energy()); + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 0) && + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 0)) { + HFRecHitEneClean->Fill(j->energy()); + } - HFRecHitEne->Fill(j->energy()); - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 0) && - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 0) ) { - HFRecHitEneClean->Fill(j->energy()); - } - - HFRecHitTime->Fill(j->time()); - - int myFlag; - myFlag= j->flagField(HcalCaloFlagLabels::HFLongShort); - if (myFlag==1) { - NHFLongShortHits++; - HFLongShortPhi->Fill(j->id().iphi()); - HFLongShortEta->Fill(j->id().ieta()); - HFLongShortEne->Fill(j->energy()); - HFLongShortTime->Fill(j->time()); - } + HFRecHitTime->Fill(j->time()); - myFlag= j->flagField(HcalCaloFlagLabels::HFDigiTime); - if (myFlag==1) { - NHFDigiTimeHits++; - HFDigiTimePhi->Fill(j->id().iphi()); - HFDigiTimeEta->Fill(j->id().ieta()); - HFDigiTimeEne->Fill(j->energy()); - HFDigiTimeTime->Fill(j->time()); - } + int myFlag; + myFlag = j->flagField(HcalCaloFlagLabels::HFLongShort); + if (myFlag == 1) { + NHFLongShortHits++; + HFLongShortPhi->Fill(j->id().iphi()); + HFLongShortEta->Fill(j->id().ieta()); + HFLongShortEne->Fill(j->energy()); + HFLongShortTime->Fill(j->time()); + } - - float en = j->energy(); - float time = j->time(); - if ((en > 20.) && (time>20.)) { - HFoccTime->Fill(j->id().ieta(),j->id().iphi()); - nTime++; - } - HcalDetId id(j->detid().rawId()); - int ieta = id.ieta(); - int iphi = id.iphi(); - int depth = id.depth(); + myFlag = j->flagField(HcalCaloFlagLabels::HFDigiTime); + if (myFlag == 1) { + NHFDigiTimeHits++; + HFDigiTimePhi->Fill(j->id().iphi()); + HFDigiTimeEta->Fill(j->id().ieta()); + HFDigiTimeEne->Fill(j->energy()); + HFDigiTimeTime->Fill(j->time()); + } + float en = j->energy(); + float time = j->time(); + if ((en > 20.) && (time > 20.)) { + HFoccTime->Fill(j->id().ieta(), j->id().iphi()); + nTime++; + } + HcalDetId id(j->detid().rawId()); + int ieta = id.ieta(); + int iphi = id.iphi(); + int depth = id.depth(); - // Long: depth = 1 - // Short: depth = 2 - HFRecHit[ieta+41][iphi][depth-1] = en; - HFRecHitFlag[ieta+41][iphi][depth-1] = j->flagField(0); + // Long: depth = 1 + // Short: depth = 2 + HFRecHit[ieta + 41][iphi][depth - 1] = en; + HFRecHitFlag[ieta + 41][iphi][depth - 1] = j->flagField(0); - /**** + /**** std::cout << "RecHit Flag = " << j->flagField(0)a << std::endl; ***/ - if (j->id().ieta()<0) { - if (j->energy() > HFThreshold) { - HFM_ETime += j->energy()*j->time(); - HFM_E += j->energy(); - } - } else { - if (j->energy() > HFThreshold) { - HFP_ETime += j->energy()*j->time(); - HFP_E += j->energy(); - } - } - + if (j->id().ieta() < 0) { + if (j->energy() > HFThreshold) { + HFM_ETime += j->energy() * j->time(); + HFM_E += j->energy(); + } + } else { + if (j->energy() > HFThreshold) { + HFP_ETime += j->energy() * j->time(); + HFP_E += j->energy(); + } } } - break; } + break; + } - edm::LogInfo("myJetAna") << "N HF Hits" << NHFLongShortHits << " " << NHFDigiTimeHits ; + edm::LogInfo("myJetAna") << "N HF Hits" << NHFLongShortHits << " " << NHFDigiTimeHits; HFLongShortNHits->Fill(NHFLongShortHits); HFDigiTimeNHits->Fill(NHFDigiTimeHits); @@ -904,28 +859,28 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { double OER = 0, OddEne, EvenEne; int nOdd, nEven; - for (int iphi=0; iphi<100; iphi++) { + for (int iphi = 0; iphi < 100; iphi++) { OddEne = EvenEne = 0.; - nOdd = 0; + nOdd = 0; nEven = 0; - for (int ieta=0; ieta<100; ieta++) { + for (int ieta = 0; ieta < 100; ieta++) { if (HFRecHit[ieta][iphi][0] > 1.0) { - if (ieta%2 == 0) { - EvenEne += HFRecHit[ieta][iphi][0]; - nEven++; - } else { - OddEne += HFRecHit[ieta][iphi][0]; - nOdd++; - } + if (ieta % 2 == 0) { + EvenEne += HFRecHit[ieta][iphi][0]; + nEven++; + } else { + OddEne += HFRecHit[ieta][iphi][0]; + nOdd++; + } } if (HFRecHit[ieta][iphi][1] > 1.0) { - if (ieta%2 == 0) { - EvenEne += HFRecHit[ieta][iphi][1]; - nEven++; - } else { - OddEne += HFRecHit[ieta][iphi][1]; - nOdd++; - } + if (ieta % 2 == 0) { + EvenEne += HFRecHit[ieta][iphi][1]; + nEven++; + } else { + OddEne += HFRecHit[ieta][iphi][1]; + nOdd++; + } } } if (((OddEne + EvenEne) > 10.) && (nOdd > 1) && (nEven > 1)) { @@ -936,46 +891,42 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { if ((HFP_E > 0.) && (HFM_E > 0.)) { HF_PMM = (HFP_ETime / HFP_E) - (HFM_ETime / HFM_E); - HFTimePMa->Fill(HF_PMM); + HFTimePMa->Fill(HF_PMM); } else { HF_PMM = INVALID; } - - if (fabs(HF_PMM) < 10.) { + if (fabs(HF_PMM) < 10.) { Pass_HFTime = true; } else { Pass_HFTime = false; } - // ************************** // *** Pass DiJet Criteria // ************************** double highestPt; double nextPt; // double dphi; - int nDiJet, nJet; + int nDiJet, nJet; - nJet = 0; - nDiJet = 0; + nJet = 0; + nDiJet = 0; Handle caloJets; - evt.getByLabel( CaloJetAlgorithm, caloJets ); - for( CaloJetCollection::const_iterator cal = caloJets->begin(); cal != caloJets->end(); ++ cal ) { - + evt.getByLabel(CaloJetAlgorithm, caloJets); + for (CaloJetCollection::const_iterator cal = caloJets->begin(); cal != caloJets->end(); ++cal) { // TODO: verify first two jets are the leading jets - if (nJet == 0) p4tmp[0] = cal->p4(); - if (nJet == 1) p4tmp[1] = cal->p4(); + if (nJet == 0) + p4tmp[0] = cal->p4(); + if (nJet == 1) + p4tmp[1] = cal->p4(); - if ( (cal->pt() > 3.) && - (fabs(cal->eta()) < 3.0) ) { + if ((cal->pt() > 3.) && (fabs(cal->eta()) < 3.0)) { nDiJet++; } nJet++; - - } - + } if (nDiJet > 1) { //dphi = deltaPhi(p4tmp[0].phi(), p4tmp[1].phi()); @@ -984,7 +935,6 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // dphi = INVALID; Pass_DiJet = false; } - // ************************** // *** Pass Vertex @@ -999,11 +949,11 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // std::cout << "Reconstructed "<< vC.size() << " vertices" << std::endl ; nVTX = vC.size(); - for (reco::VertexCollection::const_iterator vertex=vC.begin(); vertex!=vC.end(); vertex++){ - VTX = vertex->z(); + for (reco::VertexCollection::const_iterator vertex = vC.begin(); vertex != vC.end(); vertex++) { + VTX = vertex->z(); } - if ( (fabs(VTX) < 20.) && (nVTX > 0) ){ + if ((fabs(VTX) < 20.) && (nVTX > 0)) { Pass_Vertex = true; } else { Pass_Vertex = false; @@ -1012,10 +962,9 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // *********************** // *********************** - nBNC[evt.bunchCrossing()]++; totBNC++; - + // Pass = true; // *** Check for tracks @@ -1025,29 +974,25 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { // if ((Pass) && (tC.size()>1)) { // } else { // Pass = false; - // } - + // } // ******************************** // *** Pixel Clusters // ******************************** - edm::Handle< edmNew::DetSetVector > hClusterColl; + edm::Handle > hClusterColl; evt.getByLabel("siPixelClusters", hClusterColl); - auto const & clustColl = *(hClusterColl.product()); + auto const &clustColl = *(hClusterColl.product()); edm::Handle trackCollection; evt.getByLabel("generalTracks", trackCollection); - auto const & tC = *(trackCollection.product()); - + auto const &tC = *(trackCollection.product()); // ************************** // *** Event Passed Selection // ************************** - if (evt.id().run() == 1) { - if ( (Pass_DiJet) && - (Pass_Vertex) ) { + if ((Pass_DiJet) && (Pass_Vertex)) { Pass = true; } else { Pass = false; @@ -1055,9 +1000,7 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { //Pass = true; } else { - if ( (Pass_BunchCrossing) && - (Pass_HFTime) && - (Pass_Vertex) ) { + if ((Pass_BunchCrossing) && (Pass_HFTime) && (Pass_Vertex)) { Pass = true; } else { Pass = false; @@ -1078,9 +1021,10 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { ***/ NTotal->Fill(0); - + //Pass = false; - if ((tC.size() > 100) && (clustColl.size() > 1000)) Pass = true; + if ((tC.size() > 100) && (clustColl.size() > 1000)) + Pass = true; //Pass = true; /**** @@ -1097,7 +1041,7 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { edm::Handle summary_h; evt.getByLabel(hcalNoiseSummaryTag_, summary_h); - if(!summary_h.isValid()) { + if (!summary_h.isValid()) { throw edm::Exception(edm::errors::ProductNotFound) << " could not find HcalNoiseSummary.\n"; // return true; } @@ -1106,31 +1050,31 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { bool Pass_NoiseSummary; Pass_NoiseSummary = true; - if(summary.minE2Over10TS()<0.7) { + if (summary.minE2Over10TS() < 0.7) { Pass_NoiseSummary = false; } - if(summary.maxE2Over10TS()>0.96) { + if (summary.maxE2Over10TS() > 0.96) { Pass_NoiseSummary = false; } - if(summary.maxHPDHits()>=17) { + if (summary.maxHPDHits() >= 17) { Pass_NoiseSummary = false; } - if(summary.maxRBXHits()>=999) { + if (summary.maxRBXHits() >= 999) { Pass_NoiseSummary = false; } - if(summary.maxHPDNoOtherHits()>=10) { + if (summary.maxHPDNoOtherHits() >= 10) { Pass_NoiseSummary = false; } - if(summary.maxZeros()>=10) { + if (summary.maxZeros() >= 10) { Pass_NoiseSummary = false; } - if(summary.min25GeVHitTime()<-9999.0) { + if (summary.min25GeVHitTime() < -9999.0) { Pass_NoiseSummary = false; } - if(summary.max25GeVHitTime()>9999.0) { + if (summary.max25GeVHitTime() > 9999.0) { Pass_NoiseSummary = false; } - if(summary.minRBXEMF()<0.01) { + if (summary.minRBXEMF() < 0.01) { } if (Pass_NoiseSummary) { @@ -1139,99 +1083,95 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { Pass = true; } - //Pass = true; if (Pass) { - NPass->Fill(0); - // ********************* - // *** Classify Event - // ********************* - int evtType = 0; - - Handle caloTowers; - evt.getByLabel( "towerMaker", caloTowers ); - - RBX RBXColl[36]; - HPD HPDColl[144]; - - for (int i=0;i<36;i++) { - RBXColl[i].et = 0; - RBXColl[i].hadEnergy = 0; - RBXColl[i].emEnergy = 0; - RBXColl[i].hcalTime = 0; - RBXColl[i].ecalTime = 0; - RBXColl[i].nTowers = 0; - } - for (int i=0;i<144;i++) { - HPDColl[i].et = 0; - HPDColl[i].hadEnergy = 0; - HPDColl[i].emEnergy = 0; - HPDColl[i].hcalTime = 0; - HPDColl[i].ecalTime = 0; - HPDColl[i].nTowers = 0; - } - - double ETotal, emFrac; - double HCALTotalCaloTowerE, ECALTotalCaloTowerE; - double HCALTotalCaloTowerE_Eta1, ECALTotalCaloTowerE_Eta1; - double HCALTotalCaloTowerE_Eta2, ECALTotalCaloTowerE_Eta2; - double HCALTotalCaloTowerE_Eta3, ECALTotalCaloTowerE_Eta3; - - ETotal = 0.; - emFrac = 0.; - - HCALTotalCaloTowerE = 0; - ECALTotalCaloTowerE = 0; - HCALTotalCaloTowerE_Eta1 = 0.; - ECALTotalCaloTowerE_Eta1 = 0.; - HCALTotalCaloTowerE_Eta2 = 0.; - ECALTotalCaloTowerE_Eta2 = 0.; - HCALTotalCaloTowerE_Eta3 = 0.; - ECALTotalCaloTowerE_Eta3 = 0.; - - for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); - tower != caloTowers->end(); tower++) { - ETotal += tower->hadEnergy(); - ETotal += tower->emEnergy(); - } + // ********************* + // *** Classify Event + // ********************* + int evtType = 0; - for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); - tower != caloTowers->end(); tower++) { + Handle caloTowers; + evt.getByLabel("towerMaker", caloTowers); - // Raw tower energy without grouping or thresholds - if (abs(tower->ieta()) < 100) EMF_Eta->Fill(tower->ieta(), emFrac); + RBX RBXColl[36]; + HPD HPDColl[144]; - if (abs(tower->ieta()) < 15) { - towerHadEnHB->Fill(tower->hadEnergy()); - towerEmEnHB->Fill(tower->emEnergy()); + for (int i = 0; i < 36; i++) { + RBXColl[i].et = 0; + RBXColl[i].hadEnergy = 0; + RBXColl[i].emEnergy = 0; + RBXColl[i].hcalTime = 0; + RBXColl[i].ecalTime = 0; + RBXColl[i].nTowers = 0; } - if ( (abs(tower->ieta()) > 17) && ((abs(tower->ieta()) < 30)) ){ - towerHadEnHE->Fill(tower->hadEnergy()); - towerEmEnHE->Fill(tower->emEnergy()); + for (int i = 0; i < 144; i++) { + HPDColl[i].et = 0; + HPDColl[i].hadEnergy = 0; + HPDColl[i].emEnergy = 0; + HPDColl[i].hcalTime = 0; + HPDColl[i].ecalTime = 0; + HPDColl[i].nTowers = 0; } - if (abs(tower->ieta()) > 29) { - towerHadEnHF->Fill(tower->hadEnergy()); - towerEmEnHF->Fill(tower->emEnergy()); + + double ETotal, emFrac; + double HCALTotalCaloTowerE, ECALTotalCaloTowerE; + double HCALTotalCaloTowerE_Eta1, ECALTotalCaloTowerE_Eta1; + double HCALTotalCaloTowerE_Eta2, ECALTotalCaloTowerE_Eta2; + double HCALTotalCaloTowerE_Eta3, ECALTotalCaloTowerE_Eta3; + + ETotal = 0.; + emFrac = 0.; + + HCALTotalCaloTowerE = 0; + ECALTotalCaloTowerE = 0; + HCALTotalCaloTowerE_Eta1 = 0.; + ECALTotalCaloTowerE_Eta1 = 0.; + HCALTotalCaloTowerE_Eta2 = 0.; + ECALTotalCaloTowerE_Eta2 = 0.; + HCALTotalCaloTowerE_Eta3 = 0.; + ECALTotalCaloTowerE_Eta3 = 0.; + + for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); tower != caloTowers->end(); tower++) { + ETotal += tower->hadEnergy(); + ETotal += tower->emEnergy(); } - towerHadEn->Fill(tower->hadEnergy()); - towerEmEn->Fill(tower->emEnergy()); - towerOuterEn->Fill(tower->outerEnergy()); + for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); tower != caloTowers->end(); tower++) { + // Raw tower energy without grouping or thresholds + if (abs(tower->ieta()) < 100) + EMF_Eta->Fill(tower->ieta(), emFrac); - // towerHadEt->Fill(tower->hadEt()); - // towerEmEt->Fill(tower->emEt()); - // towerOuterEt->Fill(tower->outerEt()); + if (abs(tower->ieta()) < 15) { + towerHadEnHB->Fill(tower->hadEnergy()); + towerEmEnHB->Fill(tower->emEnergy()); + } + if ((abs(tower->ieta()) > 17) && ((abs(tower->ieta()) < 30))) { + towerHadEnHE->Fill(tower->hadEnergy()); + towerEmEnHE->Fill(tower->emEnergy()); + } + if (abs(tower->ieta()) > 29) { + towerHadEnHF->Fill(tower->hadEnergy()); + towerEmEnHF->Fill(tower->emEnergy()); + } - if ((tower->emEnergy()+tower->hadEnergy()) != 0) { - emFrac = tower->emEnergy()/(tower->emEnergy()+tower->hadEnergy()); - towerEmFrac->Fill(emFrac); - } else { - emFrac = 0.; - } + towerHadEn->Fill(tower->hadEnergy()); + towerEmEn->Fill(tower->emEnergy()); + towerOuterEn->Fill(tower->outerEnergy()); - /*** + // towerHadEt->Fill(tower->hadEt()); + // towerEmEt->Fill(tower->emEt()); + // towerOuterEt->Fill(tower->outerEt()); + + if ((tower->emEnergy() + tower->hadEnergy()) != 0) { + emFrac = tower->emEnergy() / (tower->emEnergy() + tower->hadEnergy()); + towerEmFrac->Fill(emFrac); + } else { + emFrac = 0.; + } + + /*** std::cout << "ETotal = " << ETotal << " EMF = " << emFrac << " EM = " << tower->emEnergy() @@ -1240,38 +1180,44 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; ***/ - if (abs(tower->iphi()) < 100) EMF_Phi->Fill(tower->iphi(), emFrac); - if (abs(tower->ieta()) < 100) EMF_Eta->Fill(tower->ieta(), emFrac); - if ( (evt.id().run() == 120020) && (evt.id().event() == 453) ) { - edm::LogInfo("myJetAna") << "Bunch Crossing = " << evt.bunchCrossing() - << " Orbit Number = " << evt.orbitNumber(); + if (abs(tower->iphi()) < 100) + EMF_Phi->Fill(tower->iphi(), emFrac); + if (abs(tower->ieta()) < 100) + EMF_Eta->Fill(tower->ieta(), emFrac); + if ((evt.id().run() == 120020) && (evt.id().event() == 453)) { + edm::LogInfo("myJetAna") << "Bunch Crossing = " << evt.bunchCrossing() + << " Orbit Number = " << evt.orbitNumber(); + + if (abs(tower->iphi()) < 100) + EMF_PhiX->Fill(tower->iphi(), emFrac); + if (abs(tower->ieta()) < 100) + EMF_EtaX->Fill(tower->ieta(), emFrac); + } - if (abs(tower->iphi()) < 100) EMF_PhiX->Fill(tower->iphi(), emFrac); - if (abs(tower->ieta()) < 100) EMF_EtaX->Fill(tower->ieta(), emFrac); - } - - HCALTotalCaloTowerE += tower->hadEnergy(); - ECALTotalCaloTowerE += tower->emEnergy(); - - towerE = tower->hadEnergy() + tower->emEnergy(); - if (tower->et() > towerEtCut) caloEtaEt->Fill(tower->eta()); - if (towerE > towerECut) caloEta->Fill(tower->eta()); - caloPhi->Fill(tower->phi()); - - if (fabs(tower->eta()) < 1.3) { - HCALTotalCaloTowerE_Eta1 += tower->hadEnergy(); - ECALTotalCaloTowerE_Eta1 += tower->emEnergy(); - } - if ((fabs(tower->eta()) >= 1.3) && (fabs(tower->eta()) < 2.5)) { - HCALTotalCaloTowerE_Eta2 += tower->hadEnergy(); - ECALTotalCaloTowerE_Eta2 += tower->emEnergy(); - } - if (fabs(tower->eta()) > 2.5) { - HCALTotalCaloTowerE_Eta3 += tower->hadEnergy(); - ECALTotalCaloTowerE_Eta3 += tower->emEnergy(); - } + HCALTotalCaloTowerE += tower->hadEnergy(); + ECALTotalCaloTowerE += tower->emEnergy(); - /*** + towerE = tower->hadEnergy() + tower->emEnergy(); + if (tower->et() > towerEtCut) + caloEtaEt->Fill(tower->eta()); + if (towerE > towerECut) + caloEta->Fill(tower->eta()); + caloPhi->Fill(tower->phi()); + + if (fabs(tower->eta()) < 1.3) { + HCALTotalCaloTowerE_Eta1 += tower->hadEnergy(); + ECALTotalCaloTowerE_Eta1 += tower->emEnergy(); + } + if ((fabs(tower->eta()) >= 1.3) && (fabs(tower->eta()) < 2.5)) { + HCALTotalCaloTowerE_Eta2 += tower->hadEnergy(); + ECALTotalCaloTowerE_Eta2 += tower->emEnergy(); + } + if (fabs(tower->eta()) > 2.5) { + HCALTotalCaloTowerE_Eta3 += tower->hadEnergy(); + ECALTotalCaloTowerE_Eta3 += tower->emEnergy(); + } + + /*** std::cout << "had = " << tower->hadEnergy() << " em = " << tower->emEnergy() << " fabs(eta) = " << fabs(tower->eta()) @@ -1279,56 +1225,57 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; ***/ - if ((tower->hadEnergy() + tower->emEnergy()) > 2.0) { - - int iRBX = tower->iphi(); - iRBX = iRBX-2; - if (iRBX == 0) iRBX = 17; - if (iRBX == -1) iRBX = 18; - iRBX = (iRBX-1)/4; - - if (tower->ieta() < 0) iRBX += 18; - if (iRBX < 36) { - RBXColl[iRBX].et += tower->et(); - RBXColl[iRBX].hadEnergy += tower->hadEnergy(); - RBXColl[iRBX].emEnergy += tower->emEnergy(); - RBXColl[iRBX].hcalTime += tower->hcalTime(); - RBXColl[iRBX].ecalTime += tower->ecalTime(); - RBXColl[iRBX].nTowers++; - } - /*** + if ((tower->hadEnergy() + tower->emEnergy()) > 2.0) { + int iRBX = tower->iphi(); + iRBX = iRBX - 2; + if (iRBX == 0) + iRBX = 17; + if (iRBX == -1) + iRBX = 18; + iRBX = (iRBX - 1) / 4; + + if (tower->ieta() < 0) + iRBX += 18; + if (iRBX < 36) { + RBXColl[iRBX].et += tower->et(); + RBXColl[iRBX].hadEnergy += tower->hadEnergy(); + RBXColl[iRBX].emEnergy += tower->emEnergy(); + RBXColl[iRBX].hcalTime += tower->hcalTime(); + RBXColl[iRBX].ecalTime += tower->ecalTime(); + RBXColl[iRBX].nTowers++; + } + /*** std::cout << "iRBX = " << iRBX << " " << "ieta/iphi = " << tower->ieta() << " / " << tower->iphi() << " et = " << tower->et() << std::endl; ***/ - int iHPD = tower->iphi(); - if (tower->ieta() < 0) iHPD = iHPD + 72; - if (iHPD < 144) { - HPDColl[iHPD].et += tower->et(); - HPDColl[iHPD].hadEnergy += tower->hadEnergy(); - HPDColl[iHPD].emEnergy += tower->emEnergy(); - HPDColl[iHPD].hcalTime += tower->hcalTime(); - HPDColl[iHPD].ecalTime += tower->ecalTime(); - HPDColl[iHPD].nTowers++; - } - /*** + int iHPD = tower->iphi(); + if (tower->ieta() < 0) + iHPD = iHPD + 72; + if (iHPD < 144) { + HPDColl[iHPD].et += tower->et(); + HPDColl[iHPD].hadEnergy += tower->hadEnergy(); + HPDColl[iHPD].emEnergy += tower->emEnergy(); + HPDColl[iHPD].hcalTime += tower->hcalTime(); + HPDColl[iHPD].ecalTime += tower->ecalTime(); + HPDColl[iHPD].nTowers++; + } + /*** std::cout << "iHPD = " << iHPD << " " << "ieta/iphi = " << tower->ieta() << " / " << tower->iphi() << " et = " << tower->et() << std::endl; ***/ - + } } - } - - ECALvHCAL->Fill(HCALTotalCaloTowerE, ECALTotalCaloTowerE); - ECALvHCALEta1->Fill(HCALTotalCaloTowerE_Eta1, ECALTotalCaloTowerE_Eta1); - ECALvHCALEta2->Fill(HCALTotalCaloTowerE_Eta2, ECALTotalCaloTowerE_Eta2); - ECALvHCALEta3->Fill(HCALTotalCaloTowerE_Eta3, ECALTotalCaloTowerE_Eta3); + ECALvHCAL->Fill(HCALTotalCaloTowerE, ECALTotalCaloTowerE); + ECALvHCALEta1->Fill(HCALTotalCaloTowerE_Eta1, ECALTotalCaloTowerE_Eta1); + ECALvHCALEta2->Fill(HCALTotalCaloTowerE_Eta2, ECALTotalCaloTowerE_Eta2); + ECALvHCALEta3->Fill(HCALTotalCaloTowerE_Eta3, ECALTotalCaloTowerE_Eta3); - /*** + /*** std::cout << " Total CaloTower Energy : " << " ETotal= " << ETotal << " HCAL= " << HCALTotalCaloTowerE @@ -1336,7 +1283,7 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; ***/ - /*** + /*** << " HCAL Eta1 = " << HCALTotalCaloTowerE_Eta1 << " ECAL= " << ECALTotalCaloTowerE_Eta1 << " HCAL Eta2 = " << HCALTotalCaloTowerE_Eta2 @@ -1346,71 +1293,67 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; ***/ - - // Loop over the RBX Collection - int nRBX = 0; - int nTowers = 0; - for (int i=0;i<36;i++) { - RBX_et->Fill(RBXColl[i].et); - RBX_hadEnergy->Fill(RBXColl[i].hadEnergy); - RBX_hcalTime->Fill(RBXColl[i].hcalTime / RBXColl[i].nTowers); - RBX_nTowers->Fill(RBXColl[i].nTowers); - if (RBXColl[i].hadEnergy > 3.0) { - nRBX++; - nTowers = RBXColl[i].nTowers; + // Loop over the RBX Collection + int nRBX = 0; + int nTowers = 0; + for (int i = 0; i < 36; i++) { + RBX_et->Fill(RBXColl[i].et); + RBX_hadEnergy->Fill(RBXColl[i].hadEnergy); + RBX_hcalTime->Fill(RBXColl[i].hcalTime / RBXColl[i].nTowers); + RBX_nTowers->Fill(RBXColl[i].nTowers); + if (RBXColl[i].hadEnergy > 3.0) { + nRBX++; + nTowers = RBXColl[i].nTowers; + } + } + RBX_N->Fill(nRBX); + if ((nRBX == 1) && (nTowers > 24)) { + evtType = 1; } - } - RBX_N->Fill(nRBX); - if ( (nRBX == 1) && (nTowers > 24) ) { - evtType = 1; - } - // Loop over the HPD Collection - int nHPD = 0; - for (int i=0;i<144;i++) { - HPD_et->Fill(HPDColl[i].et); - HPD_hadEnergy->Fill(HPDColl[i].hadEnergy); - HPD_hcalTime->Fill(HPDColl[i].hcalTime / HPDColl[i].nTowers); - HPD_nTowers->Fill(HPDColl[i].nTowers); - if (HPDColl[i].hadEnergy > 3.0) { - nHPD++; - nTowers = HPDColl[i].nTowers; + // Loop over the HPD Collection + int nHPD = 0; + for (int i = 0; i < 144; i++) { + HPD_et->Fill(HPDColl[i].et); + HPD_hadEnergy->Fill(HPDColl[i].hadEnergy); + HPD_hcalTime->Fill(HPDColl[i].hcalTime / HPDColl[i].nTowers); + HPD_nTowers->Fill(HPDColl[i].nTowers); + if (HPDColl[i].hadEnergy > 3.0) { + nHPD++; + nTowers = HPDColl[i].nTowers; + } + } + HPD_N->Fill(nHPD); + if ((nHPD == 1) && (nTowers > 6)) { + evtType = 2; + edm::LogInfo("category") << " nHPD = " << nHPD << " Towers = " << nTowers << " Type = " << evtType; } - } - HPD_N->Fill(nHPD); - if ( (nHPD == 1) && (nTowers > 6) ) { - evtType = 2; - edm::LogInfo("category") << " nHPD = " << nHPD - << " Towers = " << nTowers - << " Type = " << evtType ; - } - - // ************************************************************** - // ** Access Trigger Information - // ************************************************************** - // **** Get the TriggerResults container - Handle triggerResults; - evt.getByLabel(theTriggerResultsLabel, triggerResults); + // ************************************************************** + // ** Access Trigger Information + // ************************************************************** - Int_t JetLoPass = 0; - - if (triggerResults.isValid()) { - edm::LogInfo("myJetAna") << "trigger valid " ; - // edm::TriggerNames triggerNames; // TriggerNames class - // triggerNames.init(*triggerResults); - unsigned int n = triggerResults->size(); - for (unsigned int i=0; i!=n; i++) { + // **** Get the TriggerResults container + Handle triggerResults; + evt.getByLabel(theTriggerResultsLabel, triggerResults); - /*** + Int_t JetLoPass = 0; + + if (triggerResults.isValid()) { + edm::LogInfo("myJetAna") << "trigger valid "; + // edm::TriggerNames triggerNames; // TriggerNames class + // triggerNames.init(*triggerResults); + unsigned int n = triggerResults->size(); + for (unsigned int i = 0; i != n; i++) { + /*** std::cout << " Trigger Name = " << triggerNames.triggerName(i) << " Accept = " << triggerResults->accept(i) << std::endl; ***/ - // if (DEBUG) std::cout << triggerNames.triggerName(i) << std::endl; + // if (DEBUG) std::cout << triggerNames.triggerName(i) << std::endl; - /*** + /*** if ( triggerNames.triggerName(i) == "HLT_Jet30" ) { JetLoPass = triggerResults->accept(i); if (DEBUG) std::cout << "Found HLT_Jet30 " @@ -1418,25 +1361,23 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; } ***/ + } - } - - } else { + } else { + edm::Handle *tr = new edm::Handle; + triggerResults = (*tr); - edm::Handle *tr = new edm::Handle; - triggerResults = (*tr); + // std::cout << "triggerResults is not valid" << std::endl; + // std::cout << triggerResults << std::endl; + // std::cout << triggerResults.isValid() << std::endl; - // std::cout << "triggerResults is not valid" << std::endl; - // std::cout << triggerResults << std::endl; - // std::cout << triggerResults.isValid() << std::endl; - - edm::LogInfo("myJetAna") << "trigger not valid "; - edm::LogInfo("myJetAna") << "TriggerResults::HLT not found, " - "automatically select events"; - //return; - } + edm::LogInfo("myJetAna") << "trigger not valid "; + edm::LogInfo("myJetAna") << "TriggerResults::HLT not found, " + "automatically select events"; + //return; + } - /**** + /**** Handle gtRecord_h; evt.getByType (gtRecord_h); // assume only one L1 trigger record here const L1GlobalTriggerReadoutRecord* gtRecord = gtRecord_h.failedToGet () ? 0 : &*gtRecord_h; @@ -1448,335 +1389,366 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } ****/ + // ************************************************************** + // ** Loop over the two leading CaloJets and fill some histograms + // ************************************************************** + Handle caloJets; + evt.getByLabel(CaloJetAlgorithm, caloJets); + + jetInd = 0; + allJetInd = 0; + + EtaOk10 = 0; + EtaOk13 = 0; + EtaOk40 = 0; + + // const JetCorrector* corrector = + // JetCorrector::getJetCorrector (JetCorrectionService, es); + + highestPt = 0.0; + nextPt = 0.0; + + for (CaloJetCollection::const_iterator cal = caloJets->begin(); cal != caloJets->end(); ++cal) { + // double scale = corrector->correction (*cal); + double scale = 1.0; + double corPt = scale * cal->pt(); + // double corPt = cal->pt(); + // cout << "Pt = " << cal->pt() << endl; + + if (corPt > highestPt) { + nextPt = highestPt; + p4cortmp[1] = p4cortmp[0]; + highestPt = corPt; + p4cortmp[0] = scale * cal->p4(); + } else if (corPt > nextPt) { + nextPt = corPt; + p4cortmp[1] = scale * cal->p4(); + } + allJetInd++; + if (allJetInd == 1) { + h_jet1Pt->Fill(cal->pt()); + h_jet1Eta->Fill(cal->eta()); + if (JetLoPass != 0) + h_jet1PtHLT->Fill(cal->pt()); + p4tmp[0] = cal->p4(); + if (fabs(cal->eta()) < 1.0) + EtaOk10++; + if (fabs(cal->eta()) < 1.3) + EtaOk13++; + if (fabs(cal->eta()) < 4.0) + EtaOk40++; + } + if (allJetInd == 2) { + h_jet2Pt->Fill(cal->pt()); + h_jet2Eta->Fill(cal->eta()); + p4tmp[1] = cal->p4(); + if (fabs(cal->eta()) < 1.0) + EtaOk10++; + if (fabs(cal->eta()) < 1.3) + EtaOk13++; + if (fabs(cal->eta()) < 4.0) + EtaOk40++; + } - - // ************************************************************** - // ** Loop over the two leading CaloJets and fill some histograms - // ************************************************************** - Handle caloJets; - evt.getByLabel( CaloJetAlgorithm, caloJets ); - - - jetInd = 0; - allJetInd = 0; - - EtaOk10 = 0; - EtaOk13 = 0; - EtaOk40 = 0; - - // const JetCorrector* corrector = - // JetCorrector::getJetCorrector (JetCorrectionService, es); - - - highestPt = 0.0; - nextPt = 0.0; - - for( CaloJetCollection::const_iterator cal = caloJets->begin(); cal != caloJets->end(); ++ cal ) { - - // double scale = corrector->correction (*cal); - double scale = 1.0; - double corPt = scale*cal->pt(); - // double corPt = cal->pt(); - // cout << "Pt = " << cal->pt() << endl; - - if (corPt>highestPt) { - nextPt = highestPt; - p4cortmp[1] = p4cortmp[0]; - highestPt = corPt; - p4cortmp[0] = scale*cal->p4(); - } else if (corPt>nextPt) { - nextPt = corPt; - p4cortmp[1] = scale*cal->p4(); - } - - allJetInd++; - if (allJetInd == 1) { - h_jet1Pt->Fill( cal->pt() ); - h_jet1Eta->Fill( cal->eta() ); - if (JetLoPass != 0) h_jet1PtHLT->Fill( cal->pt() ); - p4tmp[0] = cal->p4(); - if ( fabs(cal->eta()) < 1.0) EtaOk10++; - if ( fabs(cal->eta()) < 1.3) EtaOk13++; - if ( fabs(cal->eta()) < 4.0) EtaOk40++; - } - if (allJetInd == 2) { - h_jet2Pt->Fill( cal->pt() ); - h_jet2Eta->Fill( cal->eta() ); - p4tmp[1] = cal->p4(); - if ( fabs(cal->eta()) < 1.0) EtaOk10++; - if ( fabs(cal->eta()) < 1.3) EtaOk13++; - if ( fabs(cal->eta()) < 4.0) EtaOk40++; - } - - if ( cal->pt() > minJetPt) { - const std::vector jetCaloRefs = cal->getCaloConstituents(); - int nConstituents = jetCaloRefs.size(); - h_nTowersCal->Fill(nConstituents); - h_EMFracCal->Fill(cal->emEnergyFraction()); - h_ptCal->Fill( cal->pt() ); - h_etaCal->Fill( cal->eta() ); - h_phiCal->Fill( cal->phi() ); - jetInd++; - } - } - - h_nCalJets->Fill( jetInd ); - - if (jetInd > 1) { - LeadMass = (p4tmp[0]+p4tmp[1]).mass(); - dijetMass->Fill( LeadMass ); - } - - - // ****************** - // *** Jet Properties - // ****************** - - int nTow1, nTow2, nTow3, nTow4; - // Handle jets; - // evt.getByLabel( CaloJetAlgorithm, jets ); - - // ********************************************************* - // --- Loop over jets and make a list of all the used towers - int jjet = 0; - for ( CaloJetCollection::const_iterator ijet=caloJets->begin(); ijet!=caloJets->end(); ijet++) { - jjet++; - - float hadEne = ijet->hadEnergyInHB() + ijet->hadEnergyInHO() + - ijet->hadEnergyInHE() + ijet->hadEnergyInHF(); - float emEne = ijet->emEnergyInEB() + ijet->emEnergyInEE() + ijet->emEnergyInHF(); - float had = ijet->energyFractionHadronic(); - float j_et = ijet->et(); - - // *** Barrel - if (fabs(ijet->eta()) < 1.3) { - totEneLeadJetEta1->Fill(hadEne+emEne); - hadEneLeadJetEta1->Fill(ijet->hadEnergyInHB()); - emEneLeadJetEta1->Fill(ijet->emEnergyInEB()); - if (ijet->pt() > minJetPt10) hadFracEta1->Fill(had); + if (cal->pt() > minJetPt) { + const std::vector jetCaloRefs = cal->getCaloConstituents(); + int nConstituents = jetCaloRefs.size(); + h_nTowersCal->Fill(nConstituents); + h_EMFracCal->Fill(cal->emEnergyFraction()); + h_ptCal->Fill(cal->pt()); + h_etaCal->Fill(cal->eta()); + h_phiCal->Fill(cal->phi()); + jetInd++; + } } - // *** EndCap - if ((fabs(ijet->eta()) > 1.3) && (fabs(ijet->eta()) < 3.) ) { - totEneLeadJetEta2->Fill(hadEne+emEne); - hadEneLeadJetEta2->Fill(ijet->hadEnergyInHE()); - emEneLeadJetEta2->Fill(ijet->emEnergyInEE()); - if (ijet->pt() > minJetPt10) hadFracEta2->Fill(had); - } + h_nCalJets->Fill(jetInd); - // *** Forward - if (fabs(ijet->eta()) > 3.) { - totEneLeadJetEta3->Fill(hadEne+emEne); - hadEneLeadJetEta3->Fill(hadEne); - emEneLeadJetEta3->Fill(emEne); - if (ijet->pt() > minJetPt10) hadFracEta3->Fill(had); + if (jetInd > 1) { + LeadMass = (p4tmp[0] + p4tmp[1]).mass(); + dijetMass->Fill(LeadMass); } - // *** CaloTowers in Jet - const std::vector jetCaloRefs = ijet->getCaloConstituents(); - int nConstituents = jetCaloRefs.size(); - NTowers->Fill(nConstituents); - - if (jjet == 1) { - - nTow1 = nTow2 = nTow3 = nTow4 = 0; - for (int i = 0; i et(); + // ****************** + // *** Jet Properties + // ****************** + + int nTow1, nTow2, nTow3, nTow4; + // Handle jets; + // evt.getByLabel( CaloJetAlgorithm, jets ); + + // ********************************************************* + // --- Loop over jets and make a list of all the used towers + int jjet = 0; + for (CaloJetCollection::const_iterator ijet = caloJets->begin(); ijet != caloJets->end(); ijet++) { + jjet++; + + float hadEne = ijet->hadEnergyInHB() + ijet->hadEnergyInHO() + ijet->hadEnergyInHE() + ijet->hadEnergyInHF(); + float emEne = ijet->emEnergyInEB() + ijet->emEnergyInEE() + ijet->emEnergyInHF(); + float had = ijet->energyFractionHadronic(); + float j_et = ijet->et(); + + // *** Barrel + if (fabs(ijet->eta()) < 1.3) { + totEneLeadJetEta1->Fill(hadEne + emEne); + hadEneLeadJetEta1->Fill(ijet->hadEnergyInHB()); + emEneLeadJetEta1->Fill(ijet->emEnergyInEB()); + if (ijet->pt() > minJetPt10) + hadFracEta1->Fill(had); + } - if (et > 0.5) nTow1++; - if (et > 1.0) nTow2++; - if (et > 1.5) nTow3++; - if (et > 2.0) nTow4++; - - hf_TowerJetEt->Fill(et/j_et); + // *** EndCap + if ((fabs(ijet->eta()) > 1.3) && (fabs(ijet->eta()) < 3.)) { + totEneLeadJetEta2->Fill(hadEne + emEne); + hadEneLeadJetEta2->Fill(ijet->hadEnergyInHE()); + emEneLeadJetEta2->Fill(ijet->emEnergyInEE()); + if (ijet->pt() > minJetPt10) + hadFracEta2->Fill(had); + } + // *** Forward + if (fabs(ijet->eta()) > 3.) { + totEneLeadJetEta3->Fill(hadEne + emEne); + hadEneLeadJetEta3->Fill(hadEne); + emEneLeadJetEta3->Fill(emEne); + if (ijet->pt() > minJetPt10) + hadFracEta3->Fill(had); } - nTowersLeadJetPt1->Fill(nTow1); - nTowersLeadJetPt2->Fill(nTow2); - nTowersLeadJetPt3->Fill(nTow3); - nTowersLeadJetPt4->Fill(nTow4); + // *** CaloTowers in Jet + const std::vector jetCaloRefs = ijet->getCaloConstituents(); + int nConstituents = jetCaloRefs.size(); + NTowers->Fill(nConstituents); + + if (jjet == 1) { + nTow1 = nTow2 = nTow3 = nTow4 = 0; + for (int i = 0; i < nConstituents; i++) { + float et = jetCaloRefs[i]->et(); + + if (et > 0.5) + nTow1++; + if (et > 1.0) + nTow2++; + if (et > 1.5) + nTow3++; + if (et > 2.0) + nTow4++; + + hf_TowerJetEt->Fill(et / j_et); + } + nTowersLeadJetPt1->Fill(nTow1); + nTowersLeadJetPt2->Fill(nTow2); + nTowersLeadJetPt3->Fill(nTow3); + nTowersLeadJetPt4->Fill(nTow4); + } } - } - + // ********************** + // *** Unclustered Energy + // ********************** - // ********************** - // *** Unclustered Energy - // ********************** + double SumPtJet(0); - double SumPtJet(0); + double SumEtNotJets(0); + double SumEtJets(0); + double SumEtTowers(0); + double TotalClusteredE(0); + double TotalUnclusteredE(0); - double SumEtNotJets(0); - double SumEtJets(0); - double SumEtTowers(0); - double TotalClusteredE(0); - double TotalUnclusteredE(0); + double sumJetPx(0); + double sumJetPy(0); - double sumJetPx(0); - double sumJetPy(0); + double sumTowerAllPx(0); + double sumTowerAllPy(0); - double sumTowerAllPx(0); - double sumTowerAllPy(0); + double sumTowerAllEx(0); + double sumTowerAllEy(0); - double sumTowerAllEx(0); - double sumTowerAllEy(0); + // double HCALTotalE; + double HBTotalE, HETotalE, HOTotalE, HFTotalE; + // double ECALTotalE; + double EBTotalE, EETotalE; - // double HCALTotalE; - double HBTotalE, HETotalE, HOTotalE, HFTotalE; - // double ECALTotalE; - double EBTotalE, EETotalE; + std::vector UsedTowerList; + std::vector TowerUsedInJets; + std::vector TowerNotUsedInJets; - std::vector UsedTowerList; - std::vector TowerUsedInJets; - std::vector TowerNotUsedInJets; - - // ********************* - // *** Hcal recHits - // ********************* + // ********************* + // *** Hcal recHits + // ********************* - edm::Handle spd; + edm::Handle spd; - // HCALTotalE = 0.; - HBTotalE = HETotalE = HOTotalE = HFTotalE = 0.; + // HCALTotalE = 0.; + HBTotalE = HETotalE = HOTotalE = HFTotalE = 0.; std::vector > colls; evt.getManyByType(colls); std::vector >::iterator i; - for (i=colls.begin(); i!=colls.end(); i++) { - - - for (HBHERecHitCollection::const_iterator j=(*i)->begin(); j!=(*i)->end(); j++) { + for (i = colls.begin(); i != colls.end(); i++) { + for (HBHERecHitCollection::const_iterator j = (*i)->begin(); j != (*i)->end(); j++) { // std::cout << *j << std::endl; if (j->id().subdet() == HcalBarrel) { - HBEne->Fill(j->energy()); - HBTime->Fill(j->time()); - if (!Pass_NoiseSummary) HBTimeFlagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HBTimeFlagged->Fill(j->time()); - HBTvsE->Fill(j->energy(), j->time()); - - if (j->time() > 20.) HBEneTThr->Fill(j->energy()); - - if ((j->time()<-25.) || (j->time()>75.)) { - HBEneOOT->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HBEneOOTTh->Fill(j->energy()); - if (j->energy() > HBHEThreshold1) HBEneOOTTh1->Fill(j->energy()); - } - if (j->energy() > HBHEThreshold) { - HBEneTh->Fill(j->energy()); - HBTimeTh->Fill(j->time()); - if (!Pass_NoiseSummary) HBTimeThFlagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HBTimeThFlagged->Fill(j->time()); - - if (evt.id().run() >= StableRun) HBTimeThR->Fill(j->time()); - HBTotalE += j->energy(); - HBocc->Fill(j->id().ieta(),j->id().iphi()); - hitEta->Fill(j->id().ieta()); - hitPhi->Fill(j->id().iphi()); - } - if (j->energy() > HBHEThreshold1) { - HBEneTh1->Fill(j->energy()); - HBTimeTh1->Fill(j->time()); - if (!Pass_NoiseSummary) HBTimeTh1Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HBTimeTh1Flagged->Fill(j->time()); - - if (evt.id().run() >= StableRun) HBTimeTh1R->Fill(j->time()); - if ((j->time()<-25.) || (j->time()>75.)) { - HBoccOOT->Fill(j->id().ieta(),j->id().iphi()); - } - } - if (j->energy() > HBHEThreshold2) { - HBTimeTh2->Fill(j->time()); - if (!Pass_NoiseSummary) HBTimeTh2Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HBTimeTh2Flagged->Fill(j->time()); - - if (evt.id().run() >= StableRun) HBTimeTh2R->Fill(j->time()); - } - if (j->energy() > HBHEThreshold3) { - HBTimeTh3->Fill(j->time()); - if (evt.id().run() >= StableRun) HBTimeTh3R->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 453) ) { - HBEneX->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HBTimeX->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 457) ) { - HBEneY->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HBTimeY->Fill(j->time()); - } + HBEne->Fill(j->energy()); + HBTime->Fill(j->time()); + if (!Pass_NoiseSummary) + HBTimeFlagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HBTimeFlagged->Fill(j->time()); + HBTvsE->Fill(j->energy(), j->time()); + + if (j->time() > 20.) + HBEneTThr->Fill(j->energy()); + + if ((j->time() < -25.) || (j->time() > 75.)) { + HBEneOOT->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HBEneOOTTh->Fill(j->energy()); + if (j->energy() > HBHEThreshold1) + HBEneOOTTh1->Fill(j->energy()); + } + if (j->energy() > HBHEThreshold) { + HBEneTh->Fill(j->energy()); + HBTimeTh->Fill(j->time()); + if (!Pass_NoiseSummary) + HBTimeThFlagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HBTimeThFlagged->Fill(j->time()); + + if (evt.id().run() >= StableRun) + HBTimeThR->Fill(j->time()); + HBTotalE += j->energy(); + HBocc->Fill(j->id().ieta(), j->id().iphi()); + hitEta->Fill(j->id().ieta()); + hitPhi->Fill(j->id().iphi()); + } + if (j->energy() > HBHEThreshold1) { + HBEneTh1->Fill(j->energy()); + HBTimeTh1->Fill(j->time()); + if (!Pass_NoiseSummary) + HBTimeTh1Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HBTimeTh1Flagged->Fill(j->time()); + + if (evt.id().run() >= StableRun) + HBTimeTh1R->Fill(j->time()); + if ((j->time() < -25.) || (j->time() > 75.)) { + HBoccOOT->Fill(j->id().ieta(), j->id().iphi()); + } + } + if (j->energy() > HBHEThreshold2) { + HBTimeTh2->Fill(j->time()); + if (!Pass_NoiseSummary) + HBTimeTh2Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HBTimeTh2Flagged->Fill(j->time()); + + if (evt.id().run() >= StableRun) + HBTimeTh2R->Fill(j->time()); + } + if (j->energy() > HBHEThreshold3) { + HBTimeTh3->Fill(j->time()); + if (evt.id().run() >= StableRun) + HBTimeTh3R->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 453)) { + HBEneX->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HBTimeX->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 457)) { + HBEneY->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HBTimeY->Fill(j->time()); + } } if (j->id().subdet() == HcalEndcap) { - HEEne->Fill(j->energy()); - HETime->Fill(j->time()); - if (!Pass_NoiseSummary) HETimeFlagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HETimeFlagged->Fill(j->time()); - HETvsE->Fill(j->energy(), j->time()); - - if (j->time() > 20.) HEEneTThr->Fill(j->energy()); - - if ((j->time()<-25.) || (j->time()>75.)) { - HEEneOOT->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HEEneOOTTh->Fill(j->energy()); - if (j->energy() > HBHEThreshold1) HEEneOOTTh1->Fill(j->energy()); - } + HEEne->Fill(j->energy()); + HETime->Fill(j->time()); + if (!Pass_NoiseSummary) + HETimeFlagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HETimeFlagged->Fill(j->time()); + HETvsE->Fill(j->energy(), j->time()); + + if (j->time() > 20.) + HEEneTThr->Fill(j->energy()); + + if ((j->time() < -25.) || (j->time() > 75.)) { + HEEneOOT->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HEEneOOTTh->Fill(j->energy()); + if (j->energy() > HBHEThreshold1) + HEEneOOTTh1->Fill(j->energy()); + } - if (j->energy() > HBHEThreshold) { - HEEneTh->Fill(j->energy()); - HETimeTh->Fill(j->time()); - if (!Pass_NoiseSummary) HETimeThFlagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HETimeThFlagged->Fill(j->time()); - - if (evt.id().run() >= StableRun) HETimeThR->Fill(j->time()); - HETotalE += j->energy(); - HEocc->Fill(j->id().ieta(),j->id().iphi()); - hitEta->Fill(j->id().ieta()); - hitPhi->Fill(j->id().iphi()); - } - if (j->energy() > HBHEThreshold1) { - HEEneTh1->Fill(j->energy()); - HETimeTh1->Fill(j->time()); - if (!Pass_NoiseSummary) HETimeTh1Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HETimeTh1Flagged->Fill(j->time()); - if (evt.id().run() >= StableRun) HETimeTh1R->Fill(j->time()); - if ((j->time()<-25.) || (j->time()>75.)) { - HEoccOOT->Fill(j->id().ieta(),j->id().iphi()); - } - } - if (j->energy() > HBHEThreshold2) { - HETimeTh2->Fill(j->time()); - if (!Pass_NoiseSummary) HETimeTh2Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) HETimeTh2Flagged->Fill(j->time()); - if (evt.id().run() >= StableRun) HETimeTh2R->Fill(j->time()); - } - if (j->energy() > HBHEThreshold3) { - HETimeTh3->Fill(j->time()); - if (evt.id().run() >= StableRun) HETimeTh3R->Fill(j->time()); - } + if (j->energy() > HBHEThreshold) { + HEEneTh->Fill(j->energy()); + HETimeTh->Fill(j->time()); + if (!Pass_NoiseSummary) + HETimeThFlagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HETimeThFlagged->Fill(j->time()); + + if (evt.id().run() >= StableRun) + HETimeThR->Fill(j->time()); + HETotalE += j->energy(); + HEocc->Fill(j->id().ieta(), j->id().iphi()); + hitEta->Fill(j->id().ieta()); + hitPhi->Fill(j->id().iphi()); + } + if (j->energy() > HBHEThreshold1) { + HEEneTh1->Fill(j->energy()); + HETimeTh1->Fill(j->time()); + if (!Pass_NoiseSummary) + HETimeTh1Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HETimeTh1Flagged->Fill(j->time()); + if (evt.id().run() >= StableRun) + HETimeTh1R->Fill(j->time()); + if ((j->time() < -25.) || (j->time() > 75.)) { + HEoccOOT->Fill(j->id().ieta(), j->id().iphi()); + } + } + if (j->energy() > HBHEThreshold2) { + HETimeTh2->Fill(j->time()); + if (!Pass_NoiseSummary) + HETimeTh2Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HBHETimingShapedCutsBits) != 0) + HETimeTh2Flagged->Fill(j->time()); + if (evt.id().run() >= StableRun) + HETimeTh2R->Fill(j->time()); + } + if (j->energy() > HBHEThreshold3) { + HETimeTh3->Fill(j->time()); + if (evt.id().run() >= StableRun) + HETimeTh3R->Fill(j->time()); + } - if ( (evt.id().run() == 120020) && (evt.id().event() == 453) ) { - HEEneX->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HETimeX->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 457) ) { - HEEneY->Fill(j->energy()); - if (j->energy() > HBHEThreshold) HETimeY->Fill(j->time()); - } + if ((evt.id().run() == 120020) && (evt.id().event() == 453)) { + HEEneX->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HETimeX->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 457)) { + HEEneY->Fill(j->energy()); + if (j->energy() > HBHEThreshold) + HETimeY->Fill(j->time()); + } - // Fill +-HE separately - if (j->id().ieta()<0) { - HEnegEne->Fill(j->energy()); - if (j->energy() > HBHEThreshold) { - HEnegTime->Fill(j->time()); - } - } else { - HEposEne->Fill(j->energy()); - if (j->energy() > HBHEThreshold) { - HEposTime->Fill(j->time()); - } - } - + // Fill +-HE separately + if (j->id().ieta() < 0) { + HEnegEne->Fill(j->energy()); + if (j->energy() > HBHEThreshold) { + HEnegTime->Fill(j->time()); + } + } else { + HEposEne->Fill(j->energy()); + if (j->energy() > HBHEThreshold) { + HEposTime->Fill(j->time()); + } + } } /*** @@ -1791,36 +1763,33 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } } - - HFM_ETime = 0.; - HFM_E = 0.; - HFP_ETime = 0.; - HFP_E = 0.; - - int NPMTHits; - NPMTHits = 0; - std::vector > collsNPMT; - evt.getManyByType(collsNPMT); - std::vector >::iterator iNPMT; - for (iNPMT=collsNPMT.begin(); iNPMT!=collsNPMT.end(); iNPMT++) { - for (HFRecHitCollection::const_iterator j=(*iNPMT)->begin(); j!=(*iNPMT)->end(); j++) { - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { - NPMTHits++; + HFM_ETime = 0.; + HFM_E = 0.; + HFP_ETime = 0.; + HFP_E = 0.; + + int NPMTHits; + NPMTHits = 0; + std::vector > collsNPMT; + evt.getManyByType(collsNPMT); + std::vector >::iterator iNPMT; + for (iNPMT = collsNPMT.begin(); iNPMT != collsNPMT.end(); iNPMT++) { + for (HFRecHitCollection::const_iterator j = (*iNPMT)->begin(); j != (*iNPMT)->end(); j++) { + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + NPMTHits++; + } } + break; } - break; - } - PMTHits->Fill(NPMTHits); - - - std::vector > collsHFRecHit; - evt.getManyByType(collsHFRecHit); - std::vector >::iterator iHFRecHit; - for (iHFRecHit=collsHFRecHit.begin(); iHFRecHit!=collsHFRecHit.end(); iHFRecHit++) { - for (HFRecHitCollection::const_iterator j=(*iHFRecHit)->begin(); j!=(*iHFRecHit)->end(); j++) { - - /**** + PMTHits->Fill(NPMTHits); + + std::vector > collsHFRecHit; + evt.getManyByType(collsHFRecHit); + std::vector >::iterator iHFRecHit; + for (iHFRecHit = collsHFRecHit.begin(); iHFRecHit != collsHFRecHit.end(); iHFRecHit++) { + for (HFRecHitCollection::const_iterator j = (*iHFRecHit)->begin(); j != (*iHFRecHit)->end(); j++) { + /**** float en = j->energy(); HcalDetId id(j->detid().rawId()); int ieta = id.ieta(); @@ -1828,219 +1797,240 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { int depth = id.depth(); *****/ - // std::cout << *j << std::endl; - - if (j->id().subdet() == HcalForward) { + // std::cout << *j << std::endl; - if (NPMTHits == 1) { - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { - HFEtaFlagged->Fill(j->id().ieta()); - if (j->id().depth() == 1) HFEtaFlaggedL->Fill(j->id().ieta()); - if (j->id().depth() == 2) HFEtaFlaggedS->Fill(j->id().ieta()); - } else { - HFEtaNFlagged->Fill(j->id().ieta(), j->energy()); - HFEtaPhiNFlagged->Fill(j->id().ieta(),j->id().iphi(),j->energy()); - } - } - if (j->energy() > 20.) { - if (NPMTHits == 0) { - HFEnePMT0->Fill(j->energy()); - HFTimePMT0->Fill(j->time()); - } + if (j->id().subdet() == HcalForward) { if (NPMTHits == 1) { - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { - HFEnePMT1->Fill(j->energy()); - HFTimePMT1->Fill(j->time()); + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + HFEtaFlagged->Fill(j->id().ieta()); + if (j->id().depth() == 1) + HFEtaFlaggedL->Fill(j->id().ieta()); + if (j->id().depth() == 2) + HFEtaFlaggedS->Fill(j->id().ieta()); + } else { + HFEtaNFlagged->Fill(j->id().ieta(), j->energy()); + HFEtaPhiNFlagged->Fill(j->id().ieta(), j->id().iphi(), j->energy()); } } - if (NPMTHits > 1) { - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { - HFEnePMT2->Fill(j->energy()); - HFTimePMT2->Fill(j->time()); + if (j->energy() > 20.) { + if (NPMTHits == 0) { + HFEnePMT0->Fill(j->energy()); + HFTimePMT0->Fill(j->time()); + } + if (NPMTHits == 1) { + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + HFEnePMT1->Fill(j->energy()); + HFTimePMT1->Fill(j->time()); + } + } + if (NPMTHits > 1) { + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + HFEnePMT2->Fill(j->energy()); + HFTimePMT2->Fill(j->time()); + } } } - } - HFTimeVsiEtaP->Fill(j->id().ieta(), j->time()); - HFTimeVsiEtaM->Fill(j->id().ieta(), j->time()); - - if (j->energy() > 5.) { - HFTimeVsiEtaP5->Fill(j->id().ieta(), j->time()); - HFTimeVsiEtaM5->Fill(j->id().ieta(), j->time()); - } - - if (j->energy() > 20.) { - HFTimeVsiEtaP20->Fill(j->id().ieta(), j->time()); - HFTimeVsiEtaM20->Fill(j->id().ieta(), j->time()); - } - - HFEne->Fill(j->energy()); - HFTime->Fill(j->time()); - HFTvsE->Fill(j->energy(), j->time()); - - if (j->time() > 20.) HFEneTThr->Fill(j->energy()); - - if (j->energy() > 10.) HFTvsEThr->Fill(j->energy(), j->time()); - - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1)|| - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { - HFEneFlagged->Fill(j->energy()); - HFoccFlagged->Fill(j->id().ieta(),j->id().iphi()); - HFTimeFlagged->Fill(j->time()); - HFTvsEFlagged->Fill(j->energy(), j->time()); - - // std::cout << "Flagged: " << j->energy() << " " - // << j->time() - // << std::endl; - } + HFTimeVsiEtaP->Fill(j->id().ieta(), j->time()); + HFTimeVsiEtaM->Fill(j->id().ieta(), j->time()); + if (j->energy() > 5.) { + HFTimeVsiEtaP5->Fill(j->id().ieta(), j->time()); + HFTimeVsiEtaM5->Fill(j->id().ieta(), j->time()); + } - if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) { - HFEneFlagged2->Fill(j->energy()); - HFoccFlagged2->Fill(j->id().ieta(),j->id().iphi()); - HFTimeFlagged2->Fill(j->time()); - HFTvsEFlagged2->Fill(j->energy(), j->time()); - if (j->energy() > 10.) HFTvsEFlagged2Thr->Fill(j->energy(), j->time()); - } + if (j->energy() > 20.) { + HFTimeVsiEtaP20->Fill(j->id().ieta(), j->time()); + HFTimeVsiEtaM20->Fill(j->id().ieta(), j->time()); + } - if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) { - HFTimeFlagged3->Fill(j->time()); - } + HFEne->Fill(j->energy()); + HFTime->Fill(j->time()); + HFTvsE->Fill(j->energy(), j->time()); - if (j->energy() > HFThreshold) { - HFEneTh->Fill(j->energy()); - HFTimeTh->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) HFTimeThFlagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) HFTimeThFlagged3->Fill(j->time()); + if (j->time() > 20.) + HFEneTThr->Fill(j->energy()); - if (evt.id().run() >= StableRun) HFTimeThR->Fill(j->time()); - if ( (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1)|| - (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) ) { + if (j->energy() > 10.) + HFTvsEThr->Fill(j->energy(), j->time()); - HFTimeThFlagged->Fill(j->time()); + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + HFEneFlagged->Fill(j->energy()); + HFoccFlagged->Fill(j->id().ieta(), j->id().iphi()); + HFTimeFlagged->Fill(j->time()); + HFTvsEFlagged->Fill(j->energy(), j->time()); - if (j->energy() > HFThreshold2) HFTimeTh2Flagged->Fill(j->time()); - if (j->energy() > HFThreshold3) HFTimeTh3Flagged->Fill(j->time()); + // std::cout << "Flagged: " << j->energy() << " " + // << j->time() + // << std::endl; + } - if (evt.id().run() >= StableRun) { - HFTimeThFlaggedR->Fill(j->time()); - if (NPMTHits == 1) HFTimeThFlaggedR1->Fill(j->time()); - if (NPMTHits == 2) HFTimeThFlaggedR2->Fill(j->time()); - if (NPMTHits == 3) HFTimeThFlaggedR3->Fill(j->time()); - if (NPMTHits == 4) HFTimeThFlaggedR4->Fill(j->time()); - if (NPMTHits > 1) HFTimeThFlaggedRM->Fill(j->time()); - } + if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) { + HFEneFlagged2->Fill(j->energy()); + HFoccFlagged2->Fill(j->id().ieta(), j->id().iphi()); + HFTimeFlagged2->Fill(j->time()); + HFTvsEFlagged2->Fill(j->energy(), j->time()); + if (j->energy() > 10.) + HFTvsEFlagged2Thr->Fill(j->energy(), j->time()); } - HFTotalE += j->energy(); - HFocc->Fill(j->id().ieta(),j->id().iphi()); - hitEta->Fill(j->id().ieta()); - hitPhi->Fill(j->id().iphi()); - } - if (j->energy() > HFThreshold1) { - HFEneTh1->Fill(j->energy()); - HFTimeTh1->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) HFTimeTh1Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) HFTimeTh1Flagged3->Fill(j->time()); - if (evt.id().run() >= StableRun) HFTimeTh1R->Fill(j->time()); - if ((j->time()<-20.) || (j->time()>20.)) { - HFoccOOT->Fill(j->id().ieta(),j->id().iphi()); + if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) { + HFTimeFlagged3->Fill(j->time()); } - } - if (j->energy() > HFThreshold2) { - HFTimeTh2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) HFTimeTh2Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) HFTimeTh2Flagged3->Fill(j->time()); - if (evt.id().run() >= StableRun) HFTimeTh2R->Fill(j->time()); - } - if (j->energy() > HFThreshold3) { - HFTimeTh3->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) HFTimeTh3Flagged2->Fill(j->time()); - if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) HFTimeTh3Flagged3->Fill(j->time()); - if (evt.id().run() >= StableRun) HFTimeTh3R->Fill(j->time()); - } - if (j->id().ieta()<0) { if (j->energy() > HFThreshold) { - // HFTimeM->Fill(j->time()); - HFEneM->Fill(j->energy()); - HFM_ETime += j->energy()*j->time(); - HFM_E += j->energy(); + HFEneTh->Fill(j->energy()); + HFTimeTh->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) + HFTimeThFlagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) + HFTimeThFlagged3->Fill(j->time()); + + if (evt.id().run() >= StableRun) + HFTimeThR->Fill(j->time()); + if ((j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) || + (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1)) { + HFTimeThFlagged->Fill(j->time()); + + if (j->energy() > HFThreshold2) + HFTimeTh2Flagged->Fill(j->time()); + if (j->energy() > HFThreshold3) + HFTimeTh3Flagged->Fill(j->time()); + + if (evt.id().run() >= StableRun) { + HFTimeThFlaggedR->Fill(j->time()); + if (NPMTHits == 1) + HFTimeThFlaggedR1->Fill(j->time()); + if (NPMTHits == 2) + HFTimeThFlaggedR2->Fill(j->time()); + if (NPMTHits == 3) + HFTimeThFlaggedR3->Fill(j->time()); + if (NPMTHits == 4) + HFTimeThFlaggedR4->Fill(j->time()); + if (NPMTHits > 1) + HFTimeThFlaggedRM->Fill(j->time()); + } + } + HFTotalE += j->energy(); + HFocc->Fill(j->id().ieta(), j->id().iphi()); + hitEta->Fill(j->id().ieta()); + hitPhi->Fill(j->id().iphi()); } - } else { - if (j->energy() > HFThreshold) { - // HFTimeP->Fill(j->time()); - HFEneP->Fill(j->energy()); - HFP_ETime += j->energy()*j->time(); - HFP_E += j->energy(); + + if (j->energy() > HFThreshold1) { + HFEneTh1->Fill(j->energy()); + HFTimeTh1->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) + HFTimeTh1Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) + HFTimeTh1Flagged3->Fill(j->time()); + if (evt.id().run() >= StableRun) + HFTimeTh1R->Fill(j->time()); + if ((j->time() < -20.) || (j->time() > 20.)) { + HFoccOOT->Fill(j->id().ieta(), j->id().iphi()); + } + } + if (j->energy() > HFThreshold2) { + HFTimeTh2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) + HFTimeTh2Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) + HFTimeTh2Flagged3->Fill(j->time()); + if (evt.id().run() >= StableRun) + HFTimeTh2R->Fill(j->time()); + } + if (j->energy() > HFThreshold3) { + HFTimeTh3->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFLongShort) == 1) + HFTimeTh3Flagged2->Fill(j->time()); + if (j->flagField(HcalCaloFlagLabels::HFDigiTime) == 1) + HFTimeTh3Flagged3->Fill(j->time()); + if (evt.id().run() >= StableRun) + HFTimeTh3R->Fill(j->time()); } - } - // Long and short fibers - if (j->id().depth() == 1){ - HFLEne->Fill(j->energy()); - if (j->energy() > HFThreshold) HFLTime->Fill(j->time()); - } else { - HFSEne->Fill(j->energy()); - if (j->energy() > HFThreshold) HFSTime->Fill(j->time()); + if (j->id().ieta() < 0) { + if (j->energy() > HFThreshold) { + // HFTimeM->Fill(j->time()); + HFEneM->Fill(j->energy()); + HFM_ETime += j->energy() * j->time(); + HFM_E += j->energy(); + } + } else { + if (j->energy() > HFThreshold) { + // HFTimeP->Fill(j->time()); + HFEneP->Fill(j->energy()); + HFP_ETime += j->energy() * j->time(); + HFP_E += j->energy(); + } + } + + // Long and short fibers + if (j->id().depth() == 1) { + HFLEne->Fill(j->energy()); + if (j->energy() > HFThreshold) + HFLTime->Fill(j->time()); + } else { + HFSEne->Fill(j->energy()); + if (j->energy() > HFThreshold) + HFSTime->Fill(j->time()); + } } } + break; } - break; - - } - - - - - for (int ieta=0; ieta<100; ieta++) { - for (int iphi=0; iphi<100; iphi++) { - double longF, shortF; - if (HFRecHit[ieta][iphi][0] == -10.) { - longF = 0.; - } else { - longF = HFRecHit[ieta][iphi][0]; - } - if (HFRecHit[ieta][iphi][1] == -10.) { - shortF = 0.; - } else { - shortF = HFRecHit[ieta][iphi][1]; - } - // if ((longF > HFThreshold) || (shortF > HFThreshold)) HFLSRatio->Fill((longF-shortF)/(longF+shortF)); - if (longF > 0.) HFLEneAll->Fill(longF); - if (shortF > 0.) HFSEneAll->Fill(shortF); - - - if ((longF > 20.) || (shortF > 20.)) { - double R = (longF-shortF)/(longF+shortF); - HFLSRatio->Fill(R); - if (fabs(R) > 0.995) { - - // if (longF > 110.) { - // if (longF > 50.) { - if (longF > (162.4-10.19*abs(ieta-41)+.21*abs(ieta-41)*abs(ieta-41)) ) { - HFEtaFlaggedLN->Fill(ieta-41); - - HFLEneAllF->Fill(longF); - - if (shortF == 0.) HFLEneNoSFlaggedN->Fill(longF); - } - // if (shortF > 70.) { - // if (shortF > 50.) { - if (shortF > (129.9-6.61*abs(ieta-41)+0.1153*abs(ieta-41)*abs(ieta-41)) ) { - HFEtaFlaggedSN->Fill(ieta-41); + for (int ieta = 0; ieta < 100; ieta++) { + for (int iphi = 0; iphi < 100; iphi++) { + double longF, shortF; + if (HFRecHit[ieta][iphi][0] == -10.) { + longF = 0.; + } else { + longF = HFRecHit[ieta][iphi][0]; + } + if (HFRecHit[ieta][iphi][1] == -10.) { + shortF = 0.; + } else { + shortF = HFRecHit[ieta][iphi][1]; + } + // if ((longF > HFThreshold) || (shortF > HFThreshold)) HFLSRatio->Fill((longF-shortF)/(longF+shortF)); + + if (longF > 0.) + HFLEneAll->Fill(longF); + if (shortF > 0.) + HFSEneAll->Fill(shortF); + + if ((longF > 20.) || (shortF > 20.)) { + double R = (longF - shortF) / (longF + shortF); + HFLSRatio->Fill(R); + if (fabs(R) > 0.995) { + // if (longF > 110.) { + // if (longF > 50.) { + if (longF > (162.4 - 10.19 * abs(ieta - 41) + .21 * abs(ieta - 41) * abs(ieta - 41))) { + HFEtaFlaggedLN->Fill(ieta - 41); + + HFLEneAllF->Fill(longF); + + if (shortF == 0.) + HFLEneNoSFlaggedN->Fill(longF); + } + // if (shortF > 70.) { + // if (shortF > 50.) { + if (shortF > (129.9 - 6.61 * abs(ieta - 41) + 0.1153 * abs(ieta - 41) * abs(ieta - 41))) { + HFEtaFlaggedSN->Fill(ieta - 41); - HFSEneAllF->Fill(shortF); + HFSEneAllF->Fill(shortF); - if (longF == 0.) HFSEneNoLFlaggedN->Fill(shortF); - } - } - } - /*** + if (longF == 0.) + HFSEneNoLFlaggedN->Fill(shortF); + } + } + } + /*** cout << "HF LS Ratio long= " << longF << " short= " @@ -2048,150 +2038,147 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << endl; ***/ - HFLvsS->Fill(HFRecHit[ieta][iphi][1], HFRecHit[ieta][iphi][0]); - if ( (HFRecHit[ieta][iphi][1] == -10.) && (HFRecHit[ieta][iphi][0] != -10.) ) { - HFLEneNoS->Fill(HFRecHit[ieta][iphi][0]); - if (HFRecHitFlag[ieta][iphi][0] !=0 ) HFLEneNoSFlagged->Fill(HFRecHit[ieta][iphi][0]); - } - if ( (HFRecHit[ieta][iphi][0] == -10.) && (HFRecHit[ieta][iphi][1] != -10.) ) { - HFSEneNoL->Fill(HFRecHit[ieta][iphi][1]); - if (HFRecHitFlag[ieta][iphi][1] !=0 ) HFSEneNoLFlagged->Fill(HFRecHit[ieta][iphi][1]); - } - - } - } - - if (HFP_E > 0.) HFTimeP->Fill(HFP_ETime / HFP_E); - if (HFM_E > 0.) HFTimeM->Fill(HFM_ETime / HFM_E); - - if ((HFP_E > 0.) && (HFM_E > 0.)) { - HF_PMM = (HFP_ETime / HFP_E) - (HFM_ETime / HFM_E); - HFTimePM->Fill(HF_PMM); - } else { - HF_PMM = INVALID; - } + HFLvsS->Fill(HFRecHit[ieta][iphi][1], HFRecHit[ieta][iphi][0]); + if ((HFRecHit[ieta][iphi][1] == -10.) && (HFRecHit[ieta][iphi][0] != -10.)) { + HFLEneNoS->Fill(HFRecHit[ieta][iphi][0]); + if (HFRecHitFlag[ieta][iphi][0] != 0) + HFLEneNoSFlagged->Fill(HFRecHit[ieta][iphi][0]); + } + if ((HFRecHit[ieta][iphi][0] == -10.) && (HFRecHit[ieta][iphi][1] != -10.)) { + HFSEneNoL->Fill(HFRecHit[ieta][iphi][1]); + if (HFRecHitFlag[ieta][iphi][1] != 0) + HFSEneNoLFlagged->Fill(HFRecHit[ieta][iphi][1]); + } + } + } + if (HFP_E > 0.) + HFTimeP->Fill(HFP_ETime / HFP_E); + if (HFM_E > 0.) + HFTimeM->Fill(HFM_ETime / HFM_E); + if ((HFP_E > 0.) && (HFM_E > 0.)) { + HF_PMM = (HFP_ETime / HFP_E) - (HFM_ETime / HFM_E); + HFTimePM->Fill(HF_PMM); + } else { + HF_PMM = INVALID; + } std::vector > collsHORecHit; evt.getManyByType(collsHORecHit); std::vector >::iterator iHORecHit; - for (iHORecHit=collsHORecHit.begin(); iHORecHit!=collsHORecHit.end(); iHORecHit++) { - for (HORecHitCollection::const_iterator j=(*iHORecHit)->begin(); j!=(*iHORecHit)->end(); j++) { + for (iHORecHit = collsHORecHit.begin(); iHORecHit != collsHORecHit.end(); iHORecHit++) { + for (HORecHitCollection::const_iterator j = (*iHORecHit)->begin(); j != (*iHORecHit)->end(); j++) { if (j->id().subdet() == HcalOuter) { - HOEne->Fill(j->energy()); - HOTime->Fill(j->time()); - HOTvsE->Fill(j->energy(), j->time()); - if (j->energy() > HOThreshold1) { - HOEneTh1->Fill(j->energy()); - } - if (j->energy() > HOThreshold) { - HOEneTh->Fill(j->energy()); - HOTimeTh->Fill(j->time()); - HOTotalE += j->energy(); - HOocc->Fill(j->id().ieta(),j->id().iphi()); - } - - // Separate SiPMs and HPDs: - if (((j->id().iphi()>=59 && j->id().iphi()<=70 && - j->id().ieta()>=11 && j->id().ieta()<=15) || - (j->id().iphi()>=47 && j->id().iphi()<=58 && - j->id().ieta()>=5 && j->id().ieta()<=10))) - { - HOSEne->Fill(j->energy()); - if (j->energy() > HOThreshold) HOSTime->Fill(j->time()); - } else if ((j->id().iphi()<59 || j->id().iphi()>70 || - j->id().ieta()<11 || j->id().ieta()>15) && - (j->id().iphi()<47 || j->id().iphi()>58 || - j->id().ieta()<5 || j->id().ieta()>10)) - { - HOHEne->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHTime->Fill(j->time()); - // Separate rings -1,-2,0,1,2 in HPDs: - if (j->id().ieta()<= -11){ - HOHrm2Ene->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHrm2Time->Fill(j->time()); - } else if (j->id().ieta()>= -10 && j->id().ieta() <= -5) { - HOHrm1Ene->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHrm1Time->Fill(j->time()); - } else if (j->id().ieta()>= -4 && j->id().ieta() <= 4) { - HOHr0Ene->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHr0Time->Fill(j->time()); - } else if (j->id().ieta()>= 5 && j->id().ieta() <= 10) { - HOHrp1Ene->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHrp1Time->Fill(j->time()); - } else if (j->id().ieta()>= 11) { - HOHrp2Ene->Fill(j->energy()); - if (j->energy() > HOThreshold) HOHrp2Time->Fill(j->time()); - } else { - edm::LogInfo("myJetAna") << "Finding events that are in no ring !?!" ; - edm::LogInfo("myJetAna") << "eta = " << j->id().ieta() ; - - } - } else { - edm::LogInfo("myJetAna") << "Finding events that are neither SiPM nor HPD!?"; - } - - + HOEne->Fill(j->energy()); + HOTime->Fill(j->time()); + HOTvsE->Fill(j->energy(), j->time()); + if (j->energy() > HOThreshold1) { + HOEneTh1->Fill(j->energy()); + } + if (j->energy() > HOThreshold) { + HOEneTh->Fill(j->energy()); + HOTimeTh->Fill(j->time()); + HOTotalE += j->energy(); + HOocc->Fill(j->id().ieta(), j->id().iphi()); + } + // Separate SiPMs and HPDs: + if (((j->id().iphi() >= 59 && j->id().iphi() <= 70 && j->id().ieta() >= 11 && j->id().ieta() <= 15) || + (j->id().iphi() >= 47 && j->id().iphi() <= 58 && j->id().ieta() >= 5 && j->id().ieta() <= 10))) { + HOSEne->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOSTime->Fill(j->time()); + } else if ((j->id().iphi() < 59 || j->id().iphi() > 70 || j->id().ieta() < 11 || j->id().ieta() > 15) && + (j->id().iphi() < 47 || j->id().iphi() > 58 || j->id().ieta() < 5 || j->id().ieta() > 10)) { + HOHEne->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHTime->Fill(j->time()); + // Separate rings -1,-2,0,1,2 in HPDs: + if (j->id().ieta() <= -11) { + HOHrm2Ene->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHrm2Time->Fill(j->time()); + } else if (j->id().ieta() >= -10 && j->id().ieta() <= -5) { + HOHrm1Ene->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHrm1Time->Fill(j->time()); + } else if (j->id().ieta() >= -4 && j->id().ieta() <= 4) { + HOHr0Ene->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHr0Time->Fill(j->time()); + } else if (j->id().ieta() >= 5 && j->id().ieta() <= 10) { + HOHrp1Ene->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHrp1Time->Fill(j->time()); + } else if (j->id().ieta() >= 11) { + HOHrp2Ene->Fill(j->energy()); + if (j->energy() > HOThreshold) + HOHrp2Time->Fill(j->time()); + } else { + edm::LogInfo("myJetAna") << "Finding events that are in no ring !?!"; + edm::LogInfo("myJetAna") << "eta = " << j->id().ieta(); + } + } else { + edm::LogInfo("myJetAna") << "Finding events that are neither SiPM nor HPD!?"; + } } // std::cout << *j << std::endl; } } - // HCALTotalE = HBTotalE + HETotalE + HFTotalE + HOTotalE; - // ECALTotalE = 0.; - EBTotalE = EETotalE = 0.; - + // HCALTotalE = HBTotalE + HETotalE + HFTotalE + HOTotalE; + // ECALTotalE = 0.; + EBTotalE = EETotalE = 0.; std::vector > collsEcalRecHit; evt.getManyByType(collsEcalRecHit); std::vector >::iterator iEcalRecHit; - for (iEcalRecHit=collsEcalRecHit.begin(); iEcalRecHit!=collsEcalRecHit.end(); iEcalRecHit++) { - for (EcalRecHitCollection::const_iterator j=(*iEcalRecHit)->begin(); j!=(*iEcalRecHit)->end(); j++) { - if (j->id().subdetId() == EcalBarrel) { - EBEne->Fill(j->energy()); - EBTime->Fill(j->time()); - if (j->energy() > EBEEThreshold) { - EBEneTh->Fill(j->energy()); - EBTimeTh->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 453) ) { - EBEneX->Fill(j->energy()); - EBTimeX->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 457) ) { - EBEneY->Fill(j->energy()); - EBTimeY->Fill(j->time()); - } - EBTotalE += j->energy(); - } - if (j->id().subdetId() == EcalEndcap) { - EEEne->Fill(j->energy()); - EETime->Fill(j->time()); - if (j->energy() > EBEEThreshold) { - EEEneTh->Fill(j->energy()); - EETimeTh->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 453) ) { - EEEneX->Fill(j->energy()); - EETimeX->Fill(j->time()); - } - if ( (evt.id().run() == 120020) && (evt.id().event() == 457 ) ) { - EEEneY->Fill(j->energy()); - EETimeY->Fill(j->time()); - } - EETotalE += j->energy(); - } - // std::cout << *j << std::endl; - // std::cout << "EB ID = " << j->id().subdetId() << "/" << EcalBarrel << std::endl; + for (iEcalRecHit = collsEcalRecHit.begin(); iEcalRecHit != collsEcalRecHit.end(); iEcalRecHit++) { + for (EcalRecHitCollection::const_iterator j = (*iEcalRecHit)->begin(); j != (*iEcalRecHit)->end(); j++) { + if (j->id().subdetId() == EcalBarrel) { + EBEne->Fill(j->energy()); + EBTime->Fill(j->time()); + if (j->energy() > EBEEThreshold) { + EBEneTh->Fill(j->energy()); + EBTimeTh->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 453)) { + EBEneX->Fill(j->energy()); + EBTimeX->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 457)) { + EBEneY->Fill(j->energy()); + EBTimeY->Fill(j->time()); + } + EBTotalE += j->energy(); + } + if (j->id().subdetId() == EcalEndcap) { + EEEne->Fill(j->energy()); + EETime->Fill(j->time()); + if (j->energy() > EBEEThreshold) { + EEEneTh->Fill(j->energy()); + EETimeTh->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 453)) { + EEEneX->Fill(j->energy()); + EETimeX->Fill(j->time()); + } + if ((evt.id().run() == 120020) && (evt.id().event() == 457)) { + EEEneY->Fill(j->energy()); + EETimeY->Fill(j->time()); + } + EETotalE += j->energy(); + } + // std::cout << *j << std::endl; + // std::cout << "EB ID = " << j->id().subdetId() << "/" << EcalBarrel << std::endl; } } - EBvHB->Fill(HBTotalE, EBTotalE); - EEvHE->Fill(HETotalE, EETotalE); + EBvHB->Fill(HBTotalE, EBTotalE); + EEvHE->Fill(HETotalE, EETotalE); - /***** + /***** std::vector > colls; evt.getManyByType(colls); std::vector >::iterator i; @@ -2233,16 +2220,13 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } ******/ - // ECALTotalE = EBTotalE + EETotalE; + // ECALTotalE = EBTotalE + EETotalE; - if ( (EBTotalE > 320000) && (EBTotalE < 330000) && - (HBTotalE > 2700000) && (HBTotalE < 2800000) ) { - - edm::LogInfo("myJetAna") << "Off Axis! " ; - - } + if ((EBTotalE > 320000) && (EBTotalE < 330000) && (HBTotalE > 2700000) && (HBTotalE < 2800000)) { + edm::LogInfo("myJetAna") << "Off Axis! "; + } - /*** + /*** std::cout << " Rechits: Total Energy : " << " HCAL= " << HCALTotalE << " ECAL= " << ECALTotalE @@ -2251,159 +2235,152 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << std::endl; ***/ + // ********************* + // *** CaloTowers + // ********************* + // Handle caloTowers; + // evt.getByLabel( "towerMaker", caloTowers ); + + nTow1 = nTow2 = nTow3 = nTow4 = 0; + + double sum_et = 0.0; + double sum_ex = 0.0; + double sum_ey = 0.0; + + double HFsum_et = 0.0; + double HFsum_ex = 0.0; + double HFsum_ey = 0.0; + // double sum_ez = 0.0; + + // std::cout<<">>>> Run " << evt.id().run() << " Event " << evt.id().event() << std::endl; + // --- Loop over towers and make a lists of used and unused towers + for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); tower != caloTowers->end(); tower++) { + Double_t et = tower->et(); + Double_t phix = tower->phi(); + + if (et > 0.5) + nTow1++; + if (et > 1.0) + nTow2++; + if (et > 1.5) + nTow3++; + if (et > 2.0) + nTow4++; + + // if ( (fabs(tower->ieta() > 42)) || (fabs(tower->iphi()) > 72) ) { + // std::cout << "ieta/iphi = " << tower->ieta() << " / " << tower->iphi() << std::endl; + // } + + if (tower->emEnergy() > 2.0) { + h_EmEnergy->Fill(tower->ieta(), tower->iphi(), tower->emEnergy()); + } + if (tower->hadEnergy() > 2.0) { + h_HadEnergy->Fill(tower->ieta(), tower->iphi(), tower->hadEnergy()); + } - // ********************* - // *** CaloTowers - // ********************* - // Handle caloTowers; - // evt.getByLabel( "towerMaker", caloTowers ); - - nTow1 = nTow2 = nTow3 = nTow4 = 0; - - double sum_et = 0.0; - double sum_ex = 0.0; - double sum_ey = 0.0; - - double HFsum_et = 0.0; - double HFsum_ex = 0.0; - double HFsum_ey = 0.0; - // double sum_ez = 0.0; - - - // std::cout<<">>>> Run " << evt.id().run() << " Event " << evt.id().event() << std::endl; - // --- Loop over towers and make a lists of used and unused towers - for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); - tower != caloTowers->end(); tower++) { - - Double_t et = tower->et(); - Double_t phix = tower->phi(); - - if (et > 0.5) nTow1++; - if (et > 1.0) nTow2++; - if (et > 1.5) nTow3++; - if (et > 2.0) nTow4++; - - // if ( (fabs(tower->ieta() > 42)) || (fabs(tower->iphi()) > 72) ) { - // std::cout << "ieta/iphi = " << tower->ieta() << " / " << tower->iphi() << std::endl; - // } - - if (tower->emEnergy() > 2.0) { - h_EmEnergy->Fill (tower->ieta(), tower->iphi(), tower->emEnergy()); - } - if (tower->hadEnergy() > 2.0) { - h_HadEnergy->Fill (tower->ieta(), tower->iphi(), tower->hadEnergy()); - } + if (fabs(tower->ieta()) > 29) { + HFsum_et += et; + HFsum_ex += et * cos(phix); + HFsum_ey += et * sin(phix); + } - if (fabs(tower->ieta()) > 29) { - HFsum_et += et; - HFsum_ex += et*cos(phix); - HFsum_ey += et*sin(phix); + if (et > 0.5) { + ETime->Fill(tower->ecalTime()); + HTime->Fill(tower->hcalTime()); + + // ******** + // double theta = tower->theta(); + // double e = tower->energy(); + // double et = e*sin(theta); + // double et = tower->emEt() + tower->hadEt(); + // sum_ez += e*cos(theta); + sum_et += et; + sum_ex += et * cos(phix); + sum_ey += et * sin(phix); + // ******** + + Double_t phi = tower->phi(); + SumEtTowers += tower->et(); + + sumTowerAllEx += et * cos(phi); + sumTowerAllEy += et * sin(phi); + } } + // SumEt->Fill(sum_et); + // MET->Fill(sqrt( sum_ex*sum_ex + sum_ey*sum_ey)); - if (et>0.5) { - - ETime->Fill(tower->ecalTime()); - HTime->Fill(tower->hcalTime()); + HFSumEt->Fill(HFsum_et); + HFMET->Fill(sqrt(HFsum_ex * HFsum_ex + HFsum_ey * HFsum_ey)); - // ******** - // double theta = tower->theta(); - // double e = tower->energy(); - // double et = e*sin(theta); - // double et = tower->emEt() + tower->hadEt(); - // sum_ez += e*cos(theta); - sum_et += et; - sum_ex += et*cos(phix); - sum_ey += et*sin(phix); - // ******** + hf_sumTowerAllEx->Fill(sumTowerAllEx); + hf_sumTowerAllEy->Fill(sumTowerAllEy); - Double_t phi = tower->phi(); - SumEtTowers += tower->et(); + nTowers1->Fill(nTow1); + nTowers2->Fill(nTow2); + nTowers3->Fill(nTow3); + nTowers4->Fill(nTow4); - sumTowerAllEx += et*cos(phi); - sumTowerAllEy += et*sin(phi); + // ********************* + // ********************* - } + UsedTowerList.clear(); + TowerUsedInJets.clear(); + TowerNotUsedInJets.clear(); - } + // --- Loop over jets and make a list of all the used towers + // evt.getByLabel( CaloJetAlgorithm, jets ); + for (CaloJetCollection::const_iterator ijet = caloJets->begin(); ijet != caloJets->end(); ijet++) { + Double_t jetPt = ijet->pt(); + Double_t jetEta = ijet->eta(); + Double_t jetPhi = ijet->phi(); - // SumEt->Fill(sum_et); - // MET->Fill(sqrt( sum_ex*sum_ex + sum_ey*sum_ey)); + // if (jetPt>5.0) { - HFSumEt->Fill(HFsum_et); - HFMET->Fill(sqrt( HFsum_ex*HFsum_ex + HFsum_ey*HFsum_ey)); + Double_t jetPx = jetPt * cos(jetPhi); + Double_t jetPy = jetPt * sin(jetPhi); - hf_sumTowerAllEx->Fill(sumTowerAllEx); - hf_sumTowerAllEy->Fill(sumTowerAllEy); + sumJetPx += jetPx; + sumJetPy += jetPy; - nTowers1->Fill(nTow1); - nTowers2->Fill(nTow2); - nTowers3->Fill(nTow3); - nTowers4->Fill(nTow4); + const std::vector jetCaloRefs = ijet->getCaloConstituents(); + int nConstituents = jetCaloRefs.size(); + for (int i = 0; i < nConstituents; i++) { + UsedTowerList.push_back(jetCaloRefs[i]); + } + SumPtJet += jetPt; - // ********************* - // ********************* + // } - UsedTowerList.clear(); - TowerUsedInJets.clear(); - TowerNotUsedInJets.clear(); + if ((jetPt > 80.0) && (fabs(jetEta) < 1.3)) { + st_Pt->Fill(jetPt); + int nConstituents = ijet->getCaloConstituents().size(); + st_Constituents->Fill(nConstituents); - // --- Loop over jets and make a list of all the used towers - // evt.getByLabel( CaloJetAlgorithm, jets ); - for ( CaloJetCollection::const_iterator ijet=caloJets->begin(); ijet!=caloJets->end(); ijet++) { + float maxEne = 0.; + float totEne = 0.; - Double_t jetPt = ijet->pt(); - Double_t jetEta = ijet->eta(); - Double_t jetPhi = ijet->phi(); + for (unsigned twr = 0; twr < ijet->getCaloConstituents().size(); ++twr) { + CaloTowerPtr tower = (ijet->getCaloConstituents())[twr]; + // CaloTowerDetId id = tower->id(); + if (tower->et() > 0.) { + if (tower->energy() > maxEne) + maxEne = tower->energy(); + totEne += tower->energy(); - // if (jetPt>5.0) { + st_Energy->Fill(tower->energy()); + st_EmEnergy->Fill(tower->emEnergy()); + st_HadEnergy->Fill(tower->hadEnergy()); + st_OuterEnergy->Fill(tower->outerEnergy()); - Double_t jetPx = jetPt*cos(jetPhi); - Double_t jetPy = jetPt*sin(jetPhi); + st_Eta->Fill(tower->eta()); + st_Phi->Fill(tower->phi()); - sumJetPx +=jetPx; - sumJetPy +=jetPy; + st_iEta->Fill(tower->ieta()); + st_iPhi->Fill(tower->iphi()); - const std::vector jetCaloRefs = ijet->getCaloConstituents(); - int nConstituents = jetCaloRefs.size(); - for (int i = 0; i 80.0) && (fabs(jetEta) < 1.3) ){ - st_Pt->Fill( jetPt ); - int nConstituents = ijet->getCaloConstituents().size(); - st_Constituents->Fill( nConstituents ); - - float maxEne = 0.; - float totEne = 0.; - - for(unsigned twr=0; twrgetCaloConstituents().size(); ++twr){ - CaloTowerPtr tower = (ijet->getCaloConstituents())[twr]; - // CaloTowerDetId id = tower->id(); - if( tower->et()>0. ){ - - if (tower->energy() > maxEne) maxEne = tower->energy(); - totEne += tower->energy(); - - st_Energy->Fill( tower->energy() ); - st_EmEnergy->Fill( tower->emEnergy() ); - st_HadEnergy->Fill( tower->hadEnergy() ); - st_OuterEnergy->Fill( tower->outerEnergy() ); - - st_Eta->Fill( tower->eta() ); - st_Phi->Fill( tower->phi() ); - - st_iEta->Fill( tower->ieta() ); - st_iPhi->Fill( tower->iphi() ); - - /**** + /**** std::cout << ">>> Towers : " << " " << tower->energy() << " " << tower->emEnergy() @@ -2417,109 +2394,108 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { << " " << tower->phi() << std::endl; ****/ - } - } - st_Frac->Fill( maxEne / totEne ); - + } + } + st_Frac->Fill(maxEne / totEne); } + } - } - - int NTowersUsed = UsedTowerList.size(); - - // --- Loop over towers and make a lists of used and unused towers - for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); - tower != caloTowers->end(); tower++) { - - CaloTower t = *tower; - Double_t et = tower->et(); + int NTowersUsed = UsedTowerList.size(); - if(et>0) { + // --- Loop over towers and make a lists of used and unused towers + for (CaloTowerCollection::const_iterator tower = caloTowers->begin(); tower != caloTowers->end(); tower++) { + CaloTower t = *tower; + Double_t et = tower->et(); - Double_t phi = tower->phi(); - SumEtTowers += tower->et(); + if (et > 0) { + Double_t phi = tower->phi(); + SumEtTowers += tower->et(); - sumTowerAllPx += et*cos(phi); - sumTowerAllPy += et*sin(phi); + sumTowerAllPx += et * cos(phi); + sumTowerAllPy += et * sin(phi); - bool used = false; + bool used = false; - for(int i=0; iid() == UsedTowerList[i]->id()){ - used=true; - break; + for (int i = 0; i < NTowersUsed; i++) { + if (tower->id() == UsedTowerList[i]->id()) { + used = true; + break; + } } - } - if (used) { - TowerUsedInJets.push_back(t); - } else { - TowerNotUsedInJets.push_back(t); + if (used) { + TowerUsedInJets.push_back(t); + } else { + TowerNotUsedInJets.push_back(t); + } } } - } - - int nUsed = TowerUsedInJets.size(); - int nNotUsed = TowerNotUsedInJets.size(); - SumEtJets = 0; - SumEtNotJets = 0; - TotalClusteredE = 0; - TotalUnclusteredE = 0; - - for(int i=0;iFill(TowerUsedInJets[i].energy()); - if (TowerUsedInJets[i].energy() > 1.0) - TotalClusteredE += TowerUsedInJets[i].energy(); - } - h_jetEt->Fill(SumEtJets); - - for(int i=0;i 0.5) - SumEtNotJets += TowerNotUsedInJets[i].et(); - h_UnclusteredEt->Fill(TowerNotUsedInJets[i].et()); - h_UnclusteredEts->Fill(TowerNotUsedInJets[i].et()); - h_UnclusteredE->Fill(TowerNotUsedInJets[i].energy()); - if (TowerNotUsedInJets[i].energy() > 1.0) - TotalUnclusteredE += TowerNotUsedInJets[i].energy(); - } + int nUsed = TowerUsedInJets.size(); + int nNotUsed = TowerNotUsedInJets.size(); - h_TotalClusteredE->Fill(TotalClusteredE); - h_TotalUnclusteredE->Fill(TotalUnclusteredE); - h_TotalUnclusteredEt->Fill(SumEtNotJets); + SumEtJets = 0; + SumEtNotJets = 0; + TotalClusteredE = 0; + TotalUnclusteredE = 0; - // ******************************** - // *** CaloMET - // ******************************** + for (int i = 0; i < nUsed; i++) { + SumEtJets += TowerUsedInJets[i].et(); + h_ClusteredE->Fill(TowerUsedInJets[i].energy()); + if (TowerUsedInJets[i].energy() > 1.0) + TotalClusteredE += TowerUsedInJets[i].energy(); + } + h_jetEt->Fill(SumEtJets); + + for (int i = 0; i < nNotUsed; i++) { + if (TowerNotUsedInJets[i].et() > 0.5) + SumEtNotJets += TowerNotUsedInJets[i].et(); + h_UnclusteredEt->Fill(TowerNotUsedInJets[i].et()); + h_UnclusteredEts->Fill(TowerNotUsedInJets[i].et()); + h_UnclusteredE->Fill(TowerNotUsedInJets[i].energy()); + if (TowerNotUsedInJets[i].energy() > 1.0) + TotalUnclusteredE += TowerNotUsedInJets[i].energy(); + } - edm::Handle calometcoll; - evt.getByLabel("met", calometcoll); - if (calometcoll.isValid()) { - const CaloMETCollection *calometcol = calometcoll.product(); - const CaloMET *calomet; - calomet = &(calometcol->front()); - - double caloSumET = calomet->sumEt(); - double caloMET = calomet->pt(); - double caloMETSig = calomet->mEtSig(); - double caloMEx = calomet->px(); - double caloMEy = calomet->py(); - double caloMETPhi = calomet->phi(); - - SumEt->Fill(caloSumET); - MET->Fill(caloMET); - if (std::abs(OER) > 0.8) OERMET->Fill(caloMET); - - if (evtType == 0) MET_Tower->Fill(caloMET); - if (evtType == 1) MET_RBX->Fill(caloMET); - if (evtType == 2) MET_HPD->Fill(caloMET); - METSig->Fill(caloMETSig); - MEx->Fill(caloMEx); - MEy->Fill(caloMEy); - METPhi->Fill(caloMETPhi); + h_TotalClusteredE->Fill(TotalClusteredE); + h_TotalUnclusteredE->Fill(TotalUnclusteredE); + h_TotalUnclusteredEt->Fill(SumEtNotJets); + + // ******************************** + // *** CaloMET + // ******************************** + + edm::Handle calometcoll; + evt.getByLabel("met", calometcoll); + if (calometcoll.isValid()) { + const CaloMETCollection *calometcol = calometcoll.product(); + const CaloMET *calomet; + calomet = &(calometcol->front()); + + double caloSumET = calomet->sumEt(); + double caloMET = calomet->pt(); + double caloMETSig = calomet->mEtSig(); + double caloMEx = calomet->px(); + double caloMEy = calomet->py(); + double caloMETPhi = calomet->phi(); + + SumEt->Fill(caloSumET); + MET->Fill(caloMET); + if (std::abs(OER) > 0.8) + OERMET->Fill(caloMET); + + if (evtType == 0) + MET_Tower->Fill(caloMET); + if (evtType == 1) + MET_RBX->Fill(caloMET); + if (evtType == 2) + MET_HPD->Fill(caloMET); + METSig->Fill(caloMETSig); + MEx->Fill(caloMEx); + MEy->Fill(caloMEy); + METPhi->Fill(caloMETPhi); - /*** + /*** double caloEz = calomet->e_longitudinal(); double caloMaxEtInEMTowers = calomet->maxEtInEmTowers(); @@ -2535,56 +2511,54 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { double caloEmEtInEE = calomet->emEtInEE(); double caloEmEtInHF = calomet->emEtInHF(); ****/ - } - - // ******************************** - // *** Vertex - // ******************************** - VTX = INVALID; - - edm::Handle vertexCollection; - evt.getByLabel("offlinePrimaryVertices", vertexCollection); - const reco::VertexCollection vC = *(vertexCollection.product()); + } - // std::cout << "Reconstructed "<< vC.size() << " vertices" << std::endl ; - nVTX = vC.size(); - //double vertex_numTrks; - for (reco::VertexCollection::const_iterator vertex=vC.begin(); vertex!=vC.end(); vertex++){ + // ******************************** + // *** Vertex + // ******************************** + VTX = INVALID; + + edm::Handle vertexCollection; + evt.getByLabel("offlinePrimaryVertices", vertexCollection); + const reco::VertexCollection vC = *(vertexCollection.product()); + + // std::cout << "Reconstructed "<< vC.size() << " vertices" << std::endl ; + nVTX = vC.size(); + //double vertex_numTrks; + for (reco::VertexCollection::const_iterator vertex = vC.begin(); vertex != vC.end(); vertex++) { + h_Vx->Fill(vertex->x()); + h_Vy->Fill(vertex->y()); + h_Vz->Fill(vertex->z()); + VTX = vertex->z(); + // vertex_numTrks = vertex->tracksSize(); + // h_VNTrks->Fill(vertex_numTrks); + } - h_Vx->Fill(vertex->x()); - h_Vy->Fill(vertex->y()); - h_Vz->Fill(vertex->z()); - VTX = vertex->z(); - // vertex_numTrks = vertex->tracksSize(); - // h_VNTrks->Fill(vertex_numTrks); + if ((HF_PMM != INVALID) || (nVTX > 0)) { + HFvsZ->Fill(HF_PMM, VTX); + } - } + // ******************************** + // *** Pixel Clusters + // ******************************** + // edm::Handle< edmNew::DetSetVector > hClusterColl; + // evt.getByLabel("siPixelClusters", hClusterColl); + // const edmNew::DetSetVector clustColl = *(hClusterColl.product()); - if ((HF_PMM != INVALID) || (nVTX > 0)) { - HFvsZ->Fill(HF_PMM,VTX); - } + SiClusters->Fill(clustColl.size()); - // ******************************** - // *** Pixel Clusters - // ******************************** - // edm::Handle< edmNew::DetSetVector > hClusterColl; - // evt.getByLabel("siPixelClusters", hClusterColl); - // const edmNew::DetSetVector clustColl = *(hClusterColl.product()); + // ******************************** + // *** Tracks + // ******************************** + // edm::Handle trackCollection; + // evt.getByLabel("ctfWithMaterialTracks", trackCollection); + // evt.getByLabel("generalTracks", trackCollection); + // const reco::TrackCollection tC = *(trackCollection.product()); - SiClusters->Fill(clustColl.size()); + // std::cout << "ANA: Reconstructed "<< tC.size() << " tracks" << std::endl ; - // ******************************** - // *** Tracks - // ******************************** - // edm::Handle trackCollection; - // evt.getByLabel("ctfWithMaterialTracks", trackCollection); - // evt.getByLabel("generalTracks", trackCollection); - // const reco::TrackCollection tC = *(trackCollection.product()); - - // std::cout << "ANA: Reconstructed "<< tC.size() << " tracks" << std::endl ; - - // ************************************* - /***** + // ************************************* + /***** //Get the Vertex Collection edm::Handle > verticies; evt.getByLabel("offlinePrimaryVertices", verticies); @@ -2608,20 +2582,24 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } } *****/ - // ************************************* - - - h_Trk_NTrk->Fill(tC.size()); - if (NPMTHits == 0) TrkMultFlagged0->Fill(tC.size()); - if (NPMTHits == 1) TrkMultFlagged1->Fill(tC.size()); - if (NPMTHits == 2) TrkMultFlagged2->Fill(tC.size()); - if (NPMTHits == 3) TrkMultFlagged3->Fill(tC.size()); - if (NPMTHits == 4) TrkMultFlagged4->Fill(tC.size()); - if (NPMTHits > 1) TrkMultFlaggedM->Fill(tC.size()); - for (reco::TrackCollection::const_iterator track=tC.begin(); track!=tC.end(); track++){ - h_Trk_pt->Fill(track->pt()); - } - + // ************************************* + + h_Trk_NTrk->Fill(tC.size()); + if (NPMTHits == 0) + TrkMultFlagged0->Fill(tC.size()); + if (NPMTHits == 1) + TrkMultFlagged1->Fill(tC.size()); + if (NPMTHits == 2) + TrkMultFlagged2->Fill(tC.size()); + if (NPMTHits == 3) + TrkMultFlagged3->Fill(tC.size()); + if (NPMTHits == 4) + TrkMultFlagged4->Fill(tC.size()); + if (NPMTHits > 1) + TrkMultFlaggedM->Fill(tC.size()); + for (reco::TrackCollection::const_iterator track = tC.begin(); track != tC.end(); track++) { + h_Trk_pt->Fill(track->pt()); + } /**** std::cout << "Track number "<< i << std::endl ; @@ -2637,10 +2615,10 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { std::cout << "\t direction: " << track->seedDirection() << std::endl; ****/ - // ******************************** - // *** Photons - // ******************************** - /*** + // ******************************** + // *** Photons + // ******************************** + /*** edm::Handle photonCollection; evt.getByLabel("photons", photonCollection); const reco::PhotonCollection pC = *(photonCollection.product()); @@ -2650,10 +2628,10 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } ***/ - // ******************************** - // *** Muons - // ******************************** - /*** + // ******************************** + // *** Muons + // ******************************** + /*** edm::Handle muonCollection; evt.getByLabel("muons", muonCollection); @@ -2664,54 +2642,51 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { } ***/ + // ******************************** + // *** Events passing seletion cuts + // ******************************** + + // --- Cosmic Cleanup + // --- Vertex + // --- Eta + + int iJet; + iJet = 0; + for (CaloJetCollection::const_iterator ijet = caloJets->begin(); ijet != caloJets->end(); ++ijet) { + // if ( (fabs(ijet->eta()) < 1.3) && + // (fabs(ijet->pt()) > 20.) ) { + + // (ijet->emEnergyFraction() > 0.01) && + // (ijet->emEnergyFraction() > 0.99) ) { + + iJet++; + // if (iJet == 1) { + // cout << " CaloJet: Event Type = " << evtType + // << " pt = " << ijet->pt() + // << endl; + // } + h_pt->Fill(ijet->pt()); + if (evtType == 0) + h_ptTower->Fill(ijet->pt()); + if (evtType == 1) + h_ptRBX->Fill(ijet->pt()); + if (evtType == 2) + h_ptHPD->Fill(ijet->pt()); + h_et->Fill(ijet->et()); + h_eta->Fill(ijet->eta()); + h_phi->Fill(ijet->phi()); + + jetHOEne->Fill(ijet->hadEnergyInHO()); + jetEMFraction->Fill(ijet->emEnergyFraction()); + + // } + } + //***************************** + //*** Get the GenJet collection + //***************************** - - // ******************************** - // *** Events passing seletion cuts - // ******************************** - - // --- Cosmic Cleanup - // --- Vertex - // --- Eta - - int iJet; - iJet = 0; - for( CaloJetCollection::const_iterator ijet = caloJets->begin(); ijet != caloJets->end(); ++ ijet ) { - - // if ( (fabs(ijet->eta()) < 1.3) && - // (fabs(ijet->pt()) > 20.) ) { - - // (ijet->emEnergyFraction() > 0.01) && - // (ijet->emEnergyFraction() > 0.99) ) { - - iJet++; - // if (iJet == 1) { - // cout << " CaloJet: Event Type = " << evtType - // << " pt = " << ijet->pt() - // << endl; - // } - h_pt->Fill(ijet->pt()); - if (evtType == 0) h_ptTower->Fill(ijet->pt()); - if (evtType == 1) h_ptRBX->Fill(ijet->pt()); - if (evtType == 2) h_ptHPD->Fill(ijet->pt()); - h_et->Fill(ijet->et()); - h_eta->Fill(ijet->eta()); - h_phi->Fill(ijet->phi()); - - jetHOEne->Fill(ijet->hadEnergyInHO()); - jetEMFraction->Fill(ijet->emEnergyFraction()); - - // } - } - - - - //***************************** - //*** Get the GenJet collection - //***************************** - - /************** + /************** Handle genJets; evt.getByLabel( GenJetAlgorithm, genJets ); @@ -2745,23 +2720,17 @@ void myJetAna::analyze( const edm::Event& evt, const edm::EventSetup& es ) { h_nGenJets->Fill( jetInd ); *******/ } - } // *********************************** // *********************************** void myJetAna::endJob() { - - for (int i=0; i<4000; i++) { - if (((float)nBNC[i]/(float)totBNC) > 0.05) { - edm::LogInfo("myJetAna") << "+++ " << i << " " - << ((float)nBNC[i]/(float)totBNC) << " " - << nBNC[i] << " " - << totBNC ; + for (int i = 0; i < 4000; i++) { + if (((float)nBNC[i] / (float)totBNC) > 0.05) { + edm::LogInfo("myJetAna") << "+++ " << i << " " << ((float)nBNC[i] / (float)totBNC) << " " << nBNC[i] << " " + << totBNC; } } - - } #include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(myJetAna); diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.h b/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.h index 6cfccac243c5a..85fbb39df8546 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.h +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalRecHitWorkerRecover.h @@ -24,7 +24,7 @@ #include "CalibCalorimetry/EcalTPGTools/interface/EcalTPGScale.h" #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbService.h" #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/EcalBarrelGeometryRecord.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" diff --git a/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h b/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h index 1dd9d953b15ca..e1fc9c3729560 100644 --- a/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h +++ b/RecoMET/METFilters/interface/EcalBoundaryInfoCalculator.h @@ -4,7 +4,7 @@ #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "RecoCaloTools/Navigation/interface/EcalBarrelNavigator.h" diff --git a/RecoMET/METFilters/plugins/EEBadScFilter.cc b/RecoMET/METFilters/plugins/EEBadScFilter.cc index 03eeef6ad77b5..bee6f89af9d3f 100644 --- a/RecoMET/METFilters/plugins/EEBadScFilter.cc +++ b/RecoMET/METFilters/plugins/EEBadScFilter.cc @@ -25,7 +25,7 @@ #include "DataFormats/EcalDetId/interface/EEDetId.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "RecoCaloTools/Navigation/interface/CaloNavigator.h" diff --git a/RecoMET/METFilters/plugins/EcalBadCalibFilter.cc b/RecoMET/METFilters/plugins/EcalBadCalibFilter.cc index df07bc0afe2f4..9ebccffc315c8 100644 --- a/RecoMET/METFilters/plugins/EcalBadCalibFilter.cc +++ b/RecoMET/METFilters/plugins/EcalBadCalibFilter.cc @@ -30,7 +30,7 @@ #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc b/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc index ea5be321e2d9b..181483c47f9be 100644 --- a/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc +++ b/RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc @@ -45,7 +45,7 @@ #include "CondFormats/EcalObjects/interface/EcalChannelStatus.h" #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" diff --git a/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc b/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc index 78bad392993a6..01dc8ab680f99 100644 --- a/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc +++ b/RecoMET/METFilters/plugins/EcalDeadCellDeltaRFilter.cc @@ -49,7 +49,7 @@ #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/RecoMET/METFilters/plugins/EcalDeadCellTriggerPrimitiveFilter.cc b/RecoMET/METFilters/plugins/EcalDeadCellTriggerPrimitiveFilter.cc index 41846ec50d931..51bce66fb350f 100644 --- a/RecoMET/METFilters/plugins/EcalDeadCellTriggerPrimitiveFilter.cc +++ b/RecoMET/METFilters/plugins/EcalDeadCellTriggerPrimitiveFilter.cc @@ -46,7 +46,7 @@ #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" diff --git a/RecoMET/METFilters/plugins/EcalLaserCorrFilter.cc b/RecoMET/METFilters/plugins/EcalLaserCorrFilter.cc index 23cfc172d5980..0082305af37af 100644 --- a/RecoMET/METFilters/plugins/EcalLaserCorrFilter.cc +++ b/RecoMET/METFilters/plugins/EcalLaserCorrFilter.cc @@ -22,7 +22,7 @@ #include "RecoCaloTools/Navigation/interface/CaloTowerNavigator.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h" #include "FWCore/Utilities/interface/typelookup.h" ///// added as a try for CaloTopology diff --git a/RecoMET/METFilters/plugins/HFNoisyHitsFilter.cc b/RecoMET/METFilters/plugins/HFNoisyHitsFilter.cc index 60e506c02b796..0d2724c6e7ab7 100644 --- a/RecoMET/METFilters/plugins/HFNoisyHitsFilter.cc +++ b/RecoMET/METFilters/plugins/HFNoisyHitsFilter.cc @@ -31,7 +31,7 @@ #include "FWCore/Utilities/interface/Exception.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" diff --git a/RecoMuon/MuonIdentification/plugins/InterestingEcalDetIdProducer.h b/RecoMuon/MuonIdentification/plugins/InterestingEcalDetIdProducer.h index 39a1a2bdfdcb8..8748c04a8bbba 100644 --- a/RecoMuon/MuonIdentification/plugins/InterestingEcalDetIdProducer.h +++ b/RecoMuon/MuonIdentification/plugins/InterestingEcalDetIdProducer.h @@ -9,7 +9,7 @@ #include "DataFormats/MuonReco/interface/Muon.h" #include "DataFormats/MuonReco/interface/MuonFwd.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" class CaloTopology; diff --git a/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h b/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h index 9e15664c782df..32c793cc89fc9 100644 --- a/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h +++ b/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h @@ -19,7 +19,7 @@ #include "DataFormats/EgammaReco/interface/BasicCluster.h" #include "DataFormats/EgammaReco/interface/SuperCluster.h" #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h" diff --git a/Validation/RecoEgamma/plugins/PhotonValidator.cc b/Validation/RecoEgamma/plugins/PhotonValidator.cc index 526da2a6d970d..9d2bd996245bf 100644 --- a/Validation/RecoEgamma/plugins/PhotonValidator.cc +++ b/Validation/RecoEgamma/plugins/PhotonValidator.cc @@ -62,7 +62,7 @@ #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" // //#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" // diff --git a/Validation/RecoEgamma/plugins/TkConvValidator.cc b/Validation/RecoEgamma/plugins/TkConvValidator.cc index e5c86c2b94eaf..90852111a5b67 100644 --- a/Validation/RecoEgamma/plugins/TkConvValidator.cc +++ b/Validation/RecoEgamma/plugins/TkConvValidator.cc @@ -75,7 +75,7 @@ #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/CaloTopology/interface/CaloTopology.h" -#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h" +#include "Geometry/Records/interface/CaloTopologyRecord.h" // //