diff --git a/Alignment/APEEstimation/BuildFile.xml b/Alignment/APEEstimation/BuildFile.xml index 897f40305fe48..ec4d6de7c2a22 100644 --- a/Alignment/APEEstimation/BuildFile.xml +++ b/Alignment/APEEstimation/BuildFile.xml @@ -23,7 +23,6 @@ - diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc index f055d31bd63f0..28ef49a4e31d0 100644 --- a/Alignment/APEEstimation/plugins/ApeEstimator.cc +++ b/Alignment/APEEstimation/plugins/ApeEstimator.cc @@ -72,7 +72,7 @@ //added by Ajay 6Nov 2014 //....................... #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml index 465d07a43a0bb..21eecf465303d 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml +++ b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml @@ -91,7 +91,6 @@ - @@ -104,7 +103,6 @@ - diff --git a/Alignment/CommonAlignmentProducer/BuildFile.xml b/Alignment/CommonAlignmentProducer/BuildFile.xml index 1693cf982482a..63eb882b76ba2 100644 --- a/Alignment/CommonAlignmentProducer/BuildFile.xml +++ b/Alignment/CommonAlignmentProducer/BuildFile.xml @@ -28,7 +28,6 @@ - diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc index 4ac42dc2951b1..f97a627b892b8 100644 --- a/Alignment/OfflineValidation/plugins/OverlapValidation.cc +++ b/Alignment/OfflineValidation/plugins/OverlapValidation.cc @@ -40,8 +40,8 @@ #include "FWCore/ParameterSet/interface/FileInPath.h" #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" diff --git a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc index d2a8022227a81..072ccd93c2071 100644 --- a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc +++ b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc @@ -3,7 +3,7 @@ #include "CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/FEDRawData/interface/FEDNumbering.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc index a561f8f897158..5cd3ccbb028b7 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc @@ -13,7 +13,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" using namespace cms; using namespace std; diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc index d9543467e26e9..ada6c3a063323 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc @@ -2,7 +2,7 @@ #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" namespace cms { diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc index a1d46eb24e4c8..2cefd90a64e9b 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc @@ -2,7 +2,7 @@ #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" namespace cms { diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc index 5becb3de42ac5..9943129073c13 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc @@ -2,7 +2,7 @@ #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" namespace cms { diff --git a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h index a3efb55b51c6d..a45822ebe8ce2 100644 --- a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h +++ b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h @@ -37,14 +37,14 @@ #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h index 46e8efc7d6d92..78bf54246ca83 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h @@ -24,7 +24,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -#include +#include #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h" #include diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc index b4aa80659dd44..1b0221e495594 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc @@ -21,7 +21,7 @@ // Pixel geometry and cabling map #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h" #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc index 26022939c8a15..e388169b8c355 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc @@ -34,7 +34,7 @@ #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" // EDProducer related dataformat #include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h" diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h index 2e0881dab959a..66b5c2cd3727b 100644 --- a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h +++ b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h @@ -36,8 +36,8 @@ Description: Create monitorElements for the Errors in created in the reduction o #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h" diff --git a/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc b/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc index d1f8b74af9f06..68c637febc01d 100644 --- a/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc +++ b/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc @@ -19,8 +19,8 @@ #include "CalibTracker/SiPixelTools/interface/SiPixelOfflineCalibAnalysisBase.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h" diff --git a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h index 81cf97a9093f2..c111fd7e23de3 100644 --- a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h +++ b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h @@ -54,7 +54,7 @@ #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc index 1e1bd5287c5a9..e94c32a3c1115 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc @@ -19,8 +19,8 @@ #include "CLHEP/Random/RandGauss.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc index 19597fc579310..332e65e73d3fb 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc @@ -26,7 +26,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc index 7c63c26eeacbc..6116bd8ab775a 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc @@ -21,7 +21,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc index cbd213fee0a98..06b048d9ef318 100644 --- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc +++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc @@ -21,7 +21,7 @@ #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h index e773eb93abc97..b310eebae6834 100644 --- a/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h +++ b/CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h @@ -33,7 +33,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" diff --git a/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc b/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc index fcd9e483eff3f..21ef569319eca 100644 --- a/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc +++ b/CondFormats/SiPixelObjects/src/SiPixelFrameReverter.cc @@ -13,7 +13,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/CondFormats/SiPixelObjects/src/SiPixelQuality.cc b/CondFormats/SiPixelObjects/src/SiPixelQuality.cc index 8959af1d13aff..6ecd3507104c2 100644 --- a/CondFormats/SiPixelObjects/src/SiPixelQuality.cc +++ b/CondFormats/SiPixelObjects/src/SiPixelQuality.cc @@ -16,7 +16,7 @@ #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h" #include "CondFormats/SiPixelObjects/interface/PixelROC.h" #include "CondFormats/SiPixelObjects/interface/LocalPixel.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" diff --git a/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc b/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc index af6c89e9911fa..710d7815c82be 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc +++ b/CondFormats/SiPixelObjects/test/SiPixelTestSummary.cc @@ -12,7 +12,7 @@ #include "CondFormats/SiPixelObjects/interface/SiPixelDetSummary.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc index e0c70b55ac7a0..49694198b5a60 100644 --- a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc +++ b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader.cc @@ -7,7 +7,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "DataFormats/DetId/interface/DetId.h" diff --git a/CondTools/SiPixel/test/SiPixelBadModuleReader.cc b/CondTools/SiPixel/test/SiPixelBadModuleReader.cc index 69d106788ee22..b7cec357b4f56 100644 --- a/CondTools/SiPixel/test/SiPixelBadModuleReader.cc +++ b/CondTools/SiPixel/test/SiPixelBadModuleReader.cc @@ -9,7 +9,7 @@ #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h" #include "CondFormats/SiPixelObjects/interface/PixelROC.h" #include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc b/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc index 97f9c7b4dbf03..3a353b5ac2200 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc @@ -2,7 +2,7 @@ #include "CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "FWCore/ServiceRegistry/interface/Service.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc b/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc index 596e9ef02a710..3123c6b70672e 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc @@ -6,7 +6,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc b/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc index 3af1099435017..ed9659e24fcd2 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc @@ -6,7 +6,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc b/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc index bb3056f621759..cfce356827012 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc @@ -2,7 +2,7 @@ #include "CondTools/SiPixel/test/SiPixelCondObjForHLTReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "FWCore/ServiceRegistry/interface/Service.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.cc b/CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.cc index 75ac8524062aa..d2b32c46c889c 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder.cc @@ -6,7 +6,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjOfflineReader.cc b/CondTools/SiPixel/test/SiPixelCondObjOfflineReader.cc index ff11fada7e98d..4a389aaedd730 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjOfflineReader.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjOfflineReader.cc @@ -4,7 +4,7 @@ #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h" #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "FWCore/ServiceRegistry/interface/Service.h" diff --git a/CondTools/SiPixel/test/SiPixelCondObjReader.cc b/CondTools/SiPixel/test/SiPixelCondObjReader.cc index db1be36e1ee1e..2681208772f7f 100644 --- a/CondTools/SiPixel/test/SiPixelCondObjReader.cc +++ b/CondTools/SiPixel/test/SiPixelCondObjReader.cc @@ -2,7 +2,7 @@ #include "CondTools/SiPixel/test/SiPixelCondObjReader.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "FWCore/ServiceRegistry/interface/Service.h" diff --git a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.cc b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.cc index 40143a1ba91bd..cb0f05e52d74b 100644 --- a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.cc +++ b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.cc @@ -5,7 +5,7 @@ #include #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" #include "CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.cc b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.cc index 0a080e6b9c715..01a68f6ba604a 100644 --- a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.cc +++ b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.cc @@ -1,12 +1,12 @@ #include "CondFormats/SiPixelObjects/interface/SiPixelDynamicInefficiency.h" #include "CondFormats/DataRecord/interface/SiPixelDynamicInefficiencyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h" diff --git a/CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.cc b/CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.cc index 109b39e3aabc9..7e7f1da9644f2 100644 --- a/CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.cc +++ b/CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile.cc @@ -39,7 +39,7 @@ #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.cc b/CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.cc index 17973f8b90c14..cd03e1404bd39 100644 --- a/CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.cc +++ b/CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead.cc @@ -22,7 +22,7 @@ #include "SiPixelGainCalibrationRejectNoisyAndDead.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader.cc b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader.cc index f03b737891365..e0306575d3826 100644 --- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader.cc +++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader.cc @@ -6,7 +6,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc b/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc index 45af55935d27d..6bbfba7234a8c 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDB.cc @@ -4,7 +4,7 @@ #include #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" #include "CondTools/SiPixel/test/SiPixelLorentzAngleDB.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleReader.cc b/CondTools/SiPixel/test/SiPixelLorentzAngleReader.cc index c597851abb8bd..41f510be86026 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleReader.cc +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleReader.cc @@ -1,13 +1,13 @@ #include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h" #include "CondFormats/DataRecord/interface/SiPixelLorentzAngleRcd.h" #include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CondTools/SiPixel/test/SiPixelLorentzAngleReader.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/DetId/interface/DetId.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" diff --git a/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc b/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc index 79a854ef1381d..c2f03257add4c 100644 --- a/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc +++ b/CondTools/SiPixel/test/SiPixelPerformanceSummaryBuilder.cc @@ -10,7 +10,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" #include "CondFormats/SiPixelObjects/interface/SiPixelPerformanceSummary.h" diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader.cc b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader.cc index a5c8d042e1514..fbcdd9124af0a 100644 --- a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader.cc +++ b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader.cc @@ -6,7 +6,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include diff --git a/DPGAnalysis/SiStripTools/plugins/DetIdSelectorTest.cc b/DPGAnalysis/SiStripTools/plugins/DetIdSelectorTest.cc index 0cc88b86c2f37..1617bf28d98ce 100644 --- a/DPGAnalysis/SiStripTools/plugins/DetIdSelectorTest.cc +++ b/DPGAnalysis/SiStripTools/plugins/DetIdSelectorTest.cc @@ -38,7 +38,7 @@ #include "Geometry/TrackerNumberingBuilder/interface/utils.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CalibTracker/SiPixelESProducers/interface/SiPixelDetInfoFileReader.h" diff --git a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc index 39bb5499b73de..5f4e8d2758fe7 100644 --- a/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc +++ b/DPGAnalysis/SiStripTools/plugins/TrackerDpgAnalysis.cc @@ -58,7 +58,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include #include -#include +#include #include #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/DetId/interface/DetId.h" @@ -1445,7 +1445,9 @@ std::string TrackerDpgAnalysis::toStringName(uint32_t rawid, const TrackerTopolo } break; } - default: { output << "UNKNOWN"; } + default: { + output << "UNKNOWN"; + } } out = output.str(); return out; diff --git a/DQM/Physics/src/QcdLowPtDQM.cc b/DQM/Physics/src/QcdLowPtDQM.cc index bb6e597bb1166..888ec14edf9b5 100644 --- a/DQM/Physics/src/QcdLowPtDQM.cc +++ b/DQM/Physics/src/QcdLowPtDQM.cc @@ -17,8 +17,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include #include diff --git a/DQM/Physics/src/QcdUeDQM.cc b/DQM/Physics/src/QcdUeDQM.cc index 2e5083d43b5ea..d77c2e5265aa0 100644 --- a/DQM/Physics/src/QcdUeDQM.cc +++ b/DQM/Physics/src/QcdUeDQM.cc @@ -19,8 +19,8 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "CommonTools/RecoAlgos/src/TrackToRefCandidate.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" diff --git a/DQM/PixelLumi/plugins/PixelLumiDQM.cc b/DQM/PixelLumi/plugins/PixelLumiDQM.cc index f776b8cd73b73..092e172c15dda 100644 --- a/DQM/PixelLumi/plugins/PixelLumiDQM.cc +++ b/DQM/PixelLumi/plugins/PixelLumiDQM.cc @@ -31,7 +31,7 @@ #include "FWCore/Utilities/interface/EDMException.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include diff --git a/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc b/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc index 6a28509b8cdad..2bae5178c4b52 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc @@ -26,7 +26,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc b/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc index 19ad82ba4392f..fc8a587af3f3e 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc @@ -24,7 +24,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc index d3e1c201af063..4a23452db5b1c 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc @@ -28,7 +28,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h index 657adc01a83e0..a05f59b60ee56 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h @@ -31,8 +31,8 @@ #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h index 4d341f4b3b86c..177e767862ac6 100644 --- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h +++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h @@ -49,8 +49,8 @@ #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc index a8d047d5ad644..f36deb86f8ec1 100644 --- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc +++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc @@ -28,7 +28,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" diff --git a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h index ce53b0f209eea..b7e2366d37bbc 100644 --- a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h +++ b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h @@ -31,14 +31,14 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include class SiPixelDigiModule { diff --git a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc index 3568ef47bf664..0e1b8e714c103 100644 --- a/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc +++ b/DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc @@ -27,7 +27,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" // DataFormats diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc index eb8117fddd307..6d1948a2ba49c 100644 --- a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc +++ b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc @@ -29,7 +29,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc index 372fc85d7540b..59ca7e68498e0 100644 --- a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc +++ b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc @@ -35,7 +35,7 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc index 63d8963fa0c42..7af3bcec4bb4a 100644 --- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc +++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc @@ -21,7 +21,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "DataFormats/Common/interface/Handle.h" diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc index 5105ac1eae25b..f2916bb4ffa13 100644 --- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc +++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc @@ -31,7 +31,7 @@ // Geometry #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" // DataFormats #include "DataFormats/DetId/interface/DetId.h" diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc index 05762306579a7..cb1fb5b3a9ffa 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc @@ -36,7 +36,7 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc index 2994f61dbc732..3ad80308a4f9f 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc @@ -32,7 +32,7 @@ #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" diff --git a/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1Clusters.cc b/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1Clusters.cc index 32a38d5a104b2..9adcb79607d2a 100644 --- a/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1Clusters.cc +++ b/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1Clusters.cc @@ -14,7 +14,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" diff --git a/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1DeadFEDChannels.cc b/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1DeadFEDChannels.cc index 3877e6b5ccf79..64a4acc18d886 100644 --- a/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1DeadFEDChannels.cc +++ b/DQM/SiPixelPhase1Common/plugins/SiPixelPhase1DeadFEDChannels.cc @@ -15,7 +15,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h" #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h" #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" diff --git a/DQM/SiPixelPhase1Common/src/GeometryInterface.cc b/DQM/SiPixelPhase1Common/src/GeometryInterface.cc index 9c7efe2cbca40..c772cfad36f59 100644 --- a/DQM/SiPixelPhase1Common/src/GeometryInterface.cc +++ b/DQM/SiPixelPhase1Common/src/GeometryInterface.cc @@ -20,7 +20,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" @@ -203,47 +203,49 @@ void GeometryInterface::loadFromSiPixelCoordinates(edm::EventSetup const& iSetup // Quadrant names. auto pxbarrel = extractors[intern("PXBarrel")]; - addExtractor(intern("HalfCylinder"), - [coord, pxbarrel](InterestingQuantities const& iq) { - if (pxbarrel(iq) != UNDEFINED) - return UNDEFINED; - int quadrant = coord->quadrant(iq.sourceModule); - switch (quadrant) { - case 1: - return Value(12); // mO - case 2: - return Value(11); // mI - case 3: - return Value(22); // pO - case 4: - return Value(21); // pI - default: - return UNDEFINED; - } - }, - 0, - 0 // N/A + addExtractor( + intern("HalfCylinder"), + [coord, pxbarrel](InterestingQuantities const& iq) { + if (pxbarrel(iq) != UNDEFINED) + return UNDEFINED; + int quadrant = coord->quadrant(iq.sourceModule); + switch (quadrant) { + case 1: + return Value(12); // mO + case 2: + return Value(11); // mI + case 3: + return Value(22); // pO + case 4: + return Value(21); // pI + default: + return UNDEFINED; + } + }, + 0, + 0 // N/A ); - addExtractor(intern("Shell"), - [coord, pxbarrel](InterestingQuantities const& iq) { - if (pxbarrel(iq) == UNDEFINED) - return UNDEFINED; - int quadrant = coord->quadrant(iq.sourceModule); - switch (quadrant) { - case 1: - return Value(12); // mO - case 2: - return Value(11); // mI - case 3: - return Value(22); // pO - case 4: - return Value(21); // pI - default: - return UNDEFINED; - } - }, - 0, - 0 // N/A + addExtractor( + intern("Shell"), + [coord, pxbarrel](InterestingQuantities const& iq) { + if (pxbarrel(iq) == UNDEFINED) + return UNDEFINED; + int quadrant = coord->quadrant(iq.sourceModule); + switch (quadrant) { + case 1: + return Value(12); // mO + case 2: + return Value(11); // mI + case 3: + return Value(22); // pO + case 4: + return Value(21); // pI + default: + return UNDEFINED; + } + }, + 0, + 0 // N/A ); // Online Numbering. @@ -364,60 +366,66 @@ void GeometryInterface::loadFromSiPixelCoordinates(edm::EventSetup const& iSetup void GeometryInterface::loadTimebased(edm::EventSetup const& iSetup, const edm::ParameterSet& iConfig) { // extractors for quantities that are roughly time-based. We cannot book plots based on these; they have to // be grouped away in step1. - addExtractor(intern("Lumisection"), - [](InterestingQuantities const& iq) { - if (!iq.sourceEvent) - return UNDEFINED; - return Value(iq.sourceEvent->luminosityBlock()); - }, - 1, - iConfig.getParameter("max_lumisection")); + addExtractor( + intern("Lumisection"), + [](InterestingQuantities const& iq) { + if (!iq.sourceEvent) + return UNDEFINED; + return Value(iq.sourceEvent->luminosityBlock()); + }, + 1, + iConfig.getParameter("max_lumisection")); int onlineblock = iConfig.getParameter("onlineblock"); int n_onlineblocks = iConfig.getParameter("n_onlineblocks"); - addExtractor(intern("OnlineBlock"), - [onlineblock](InterestingQuantities const& iq) { - if (!iq.sourceEvent) - return UNDEFINED; - return Value(onlineblock + iq.sourceEvent->luminosityBlock() / onlineblock); - }, - // note: this range is not visible anywhere (if the RenderPlugin does its job), - // but the strange range allows the RenderPlugin to know the block size. - onlineblock, - onlineblock + n_onlineblocks - 1); + addExtractor( + intern("OnlineBlock"), + [onlineblock](InterestingQuantities const& iq) { + if (!iq.sourceEvent) + return UNDEFINED; + return Value(onlineblock + iq.sourceEvent->luminosityBlock() / onlineblock); + }, + // note: this range is not visible anywhere (if the RenderPlugin does its job), + // but the strange range allows the RenderPlugin to know the block size. + onlineblock, + onlineblock + n_onlineblocks - 1); int lumiblock = iConfig.getParameter("lumiblock"); - addExtractor(intern("LumiBlock"), - [lumiblock](InterestingQuantities const& iq) { - if (!iq.sourceEvent) - return UNDEFINED; - // The '-1' is for making 1-10 the same block rather than 0-9 - // The '+0.5' makes the block span an integer range rather n.5-m.5 - return Value(((iq.sourceEvent->luminosityBlock() - 1) / lumiblock) + 0.5); - }, - -0.5, - iConfig.getParameter("max_lumisection") / lumiblock); - - addExtractor(intern("BX"), - [](InterestingQuantities const& iq) { - if (!iq.sourceEvent) - return UNDEFINED; - return Value(iq.sourceEvent->bunchCrossing()); - }, - 1, - iConfig.getParameter("max_bunchcrossing")); + addExtractor( + intern("LumiBlock"), + [lumiblock](InterestingQuantities const& iq) { + if (!iq.sourceEvent) + return UNDEFINED; + // The '-1' is for making 1-10 the same block rather than 0-9 + // The '+0.5' makes the block span an integer range rather n.5-m.5 + return Value(((iq.sourceEvent->luminosityBlock() - 1) / lumiblock) + 0.5); + }, + -0.5, + iConfig.getParameter("max_lumisection") / lumiblock); + + addExtractor( + intern("BX"), + [](InterestingQuantities const& iq) { + if (!iq.sourceEvent) + return UNDEFINED; + return Value(iq.sourceEvent->bunchCrossing()); + }, + 1, + iConfig.getParameter("max_bunchcrossing")); } void GeometryInterface::loadModuleLevel(edm::EventSetup const& iSetup, const edm::ParameterSet& iConfig) { // stuff that is within modules. Might require some phase0/phase1/strip switching later - addExtractor(intern("row"), - [](InterestingQuantities const& iq) { return Value(iq.row); }, - 0, - iConfig.getParameter("module_rows") - 1); - addExtractor(intern("col"), - [](InterestingQuantities const& iq) { return Value(iq.col); }, - 0, - iConfig.getParameter("module_cols") - 1); + addExtractor( + intern("row"), + [](InterestingQuantities const& iq) { return Value(iq.row); }, + 0, + iConfig.getParameter("module_rows") - 1); + addExtractor( + intern("col"), + [](InterestingQuantities const& iq) { return Value(iq.col); }, + 0, + iConfig.getParameter("module_cols") - 1); } void GeometryInterface::loadFEDCabling(edm::EventSetup const& iSetup, const edm::ParameterSet& iConfig) { diff --git a/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc b/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc index 4f59cb1825902..8ea9fedb62427 100644 --- a/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc +++ b/DQM/SiPixelPhase1Common/src/SiPixelCoordinates.cc @@ -8,7 +8,7 @@ #include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h" diff --git a/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc b/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc index 0ec26322e67c6..60471d366f51b 100644 --- a/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc +++ b/DQM/SiPixelPhase1Summary/src/SiPixelPhase1Summary.cc @@ -26,7 +26,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" // DataFormats diff --git a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1RecHits.cc b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1RecHits.cc index 8e379069cdd47..d3b05430bada2 100644 --- a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1RecHits.cc +++ b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1RecHits.cc @@ -13,7 +13,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackClusters.cc b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackClusters.cc index cd189a73ff42b..9d933ddf22f62 100644 --- a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackClusters.cc +++ b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackClusters.cc @@ -21,7 +21,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" diff --git a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackEfficiency.cc b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackEfficiency.cc index e5b76b2d38e05..ae05624d07783 100644 --- a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackEfficiency.cc +++ b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackEfficiency.cc @@ -15,7 +15,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" diff --git a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackResiduals.cc b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackResiduals.cc index 6fa36834f64a7..6f51b313ec9fc 100644 --- a/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackResiduals.cc +++ b/DQM/SiPixelPhase1Track/plugins/SiPixelPhase1TrackResiduals.cc @@ -14,11 +14,11 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" namespace { diff --git a/DataFormats/MuonDetId/test/BuildFile.xml b/DataFormats/MuonDetId/test/BuildFile.xml index ac6a204c0ae49..2e6f26b2c8c95 100644 --- a/DataFormats/MuonDetId/test/BuildFile.xml +++ b/DataFormats/MuonDetId/test/BuildFile.xml @@ -7,18 +7,3 @@ - - - - - - - - - - - - - - - diff --git a/DataFormats/MuonDetId/test/RPCDetIdAnalyzer.cc b/DataFormats/MuonDetId/test/RPCDetIdAnalyzer.cc deleted file mode 100644 index 3493e550cee56..0000000000000 --- a/DataFormats/MuonDetId/test/RPCDetIdAnalyzer.cc +++ /dev/null @@ -1,136 +0,0 @@ -// -*- C++ -*- -// -// Package: RPCDetIdAnalyzer -// Class: RPCDetIdAnalyzer -// -/**\class RPCDetIdAnalyzer RPCDetIdAnalyzer.cc DataFormats/RPCDetIdAnalyzer/src/RPCDetIdAnalyzer.cc - - Description: [one line class summary] - - Implementation: - [Notes on implementation] -*/ -// -// Original Author: Marcello Maggi,161 R-006,+41227676292, -// Created: Fri Nov 4 12:32:59 CET 2011 -// -// - -// system include files -#include -#include - -// user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/MuonDetId/interface/RPCCompDetId.h" -// -// class declaration -// - -class RPCDetIdAnalyzer : public edm::EDAnalyzer { -public: - explicit RPCDetIdAnalyzer(const edm::ParameterSet&); - ~RPCDetIdAnalyzer(); - - static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - -private: - virtual void beginJob(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endJob(); - - virtual void beginRun(edm::Run const&, edm::EventSetup const&); - virtual void endRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - - // ----------member data --------------------------- -}; - -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - -// -// constructors and destructor -// -RPCDetIdAnalyzer::RPCDetIdAnalyzer(const edm::ParameterSet& iConfig) - -{ - //now do what ever initialization is needed -} - -RPCDetIdAnalyzer::~RPCDetIdAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - -// -// member functions -// - -// ------------ method called for each event ------------ -void RPCDetIdAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) - -{ - RPCCompDetId rpcgasid("WM2_S04_RB4R", 0); - - //RPCCompDetId rpcgasid("cms_rpc_dcs_03:EM1_R03_C12_C17_UP",0); - std::cout << rpcgasid << " rawid = " << rpcgasid.rawId() << std::endl; - std::cout << "Region = " << rpcgasid.region() << std::endl; - std::cout << "Ring or Wheel = " << rpcgasid.ring() << " - Wheel = " << rpcgasid.wheel() << std::endl; - std::cout << "Station or Disk = " << rpcgasid.station() << " - Disk = " << rpcgasid.disk() << std::endl; - std::cout << "Sector = " << rpcgasid.sector() << std::endl; - std::cout << "Layer = " << rpcgasid.layer() << std::endl; - std::cout << "SubSector = " << rpcgasid.subsector() << std::endl; - std::cout << std::setw(100) << std::setfill('-') << std::endl; - std::cout << "ok" << std::endl; - RPCCompDetId check(rpcgasid.rawId()); - std::cout << check << " rawid = " << check.rawId() << std::endl; - std::cout << "Region = " << check.region() << std::endl; - std::cout << "Ring or Wheel = " << check.ring() << " - Wheel = " << check.wheel() << std::endl; - std::cout << "Station or Disk = " << check.station() << " - Disk = " << check.disk() << std::endl; - std::cout << "Sector = " << check.sector() << std::endl; - std::cout << "Layer = " << check.layer() << std::endl; - std::cout << "SubSector = " << check.subsector() << std::endl; -} - -// ------------ method called once each job just before starting event loop ------------ -void RPCDetIdAnalyzer::beginJob() {} - -// ------------ method called once each job just after ending the event loop ------------ -void RPCDetIdAnalyzer::endJob() {} - -// ------------ method called when starting to processes a run ------------ -void RPCDetIdAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a run ------------ -void RPCDetIdAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) {} - -// ------------ method called when starting to processes a luminosity block ------------ -void RPCDetIdAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {} - -// ------------ method called when ending the processing of a luminosity block ------------ -void RPCDetIdAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {} - -// ------------ method fills 'descriptions' with the allowed parameters for the module ------------ -void RPCDetIdAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { - //The following says we do not know what parameters are allowed so do no validation - // Please change this to state exactly what you do use, even if it is no parameters - edm::ParameterSetDescription desc; - desc.setUnknown(); - descriptions.addDefault(desc); -} - -//define this as a plug-in -DEFINE_FWK_MODULE(RPCDetIdAnalyzer); diff --git a/DataFormats/MuonDetId/test/cdan_cfg.py b/DataFormats/MuonDetId/test/cdan_cfg.py deleted file mode 100644 index 2bf2ce119d59a..0000000000000 --- a/DataFormats/MuonDetId/test/cdan_cfg.py +++ /dev/null @@ -1,43 +0,0 @@ -# Configuration file to run CSCDetIdAnalyzer -# to dump CSC geometry focussing on CSCDetId -# Tim Cox 12.06.2008 pythonized - -import FWCore.ParameterSet.Config as cms - -process = cms.Process("GeometryTest") -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") -process.load("Geometry.MuonCommonData.muonEndcapIdealGeometryXML_cfi") -# flags for modelling of CSC layer & strip geometry -process.load("Geometry.CSCGeometry.cscGeometry_cfi") - -process.source = cms.Source("EmptySource") - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -process.MessageLogger = cms.Service("MessageLogger", - # For LogDebug/LogTrace output... - # untracked vstring debugModules = { "*" } - # No constraint on log.out content...equivalent to threshold INFO - # 0 means none, -1 means all (?) - cout = cms.untracked.PSet( - threshold = cms.untracked.string('DEBUG'), - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - default = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - CSC = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - noLineBreaks = cms.untracked.bool(True) - ), - categories = cms.untracked.vstring('CSC'), - destinations = cms.untracked.vstring('cout') -) - -process.producer = cms.EDAnalyzer("CSCDetIdAnalyzer") - -process.p1 = cms.Path(process.producer) - diff --git a/DataFormats/MuonDetId/test/rpcdetidanalyzer_cfg.py b/DataFormats/MuonDetId/test/rpcdetidanalyzer_cfg.py deleted file mode 100644 index de90c258a905f..0000000000000 --- a/DataFormats/MuonDetId/test/rpcdetidanalyzer_cfg.py +++ /dev/null @@ -1,16 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("Demo") - -process.load("FWCore.MessageService.MessageLogger_cfi") - -process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) - -process.source = cms.Source("EmptySource" - ) - -process.demo = cms.EDAnalyzer('RPCDetIdAnalyzer' -) - - -process.p = cms.Path(process.demo) diff --git a/DataFormats/MuonDetId/test/testRPCDetId.cc b/DataFormats/MuonDetId/test/testRPCDetId.cc index 7aac38e2bc723..a03d4e9648fbb 100644 --- a/DataFormats/MuonDetId/test/testRPCDetId.cc +++ b/DataFormats/MuonDetId/test/testRPCDetId.cc @@ -7,31 +7,41 @@ */ #include -#include -#include +#include "DataFormats/MuonDetId/interface/RPCDetId.h" +#include "DataFormats/MuonDetId/interface/RPCCompDetId.h" +#include "FWCore/Utilities/interface/Exception.h" +#include #include + using namespace std; class testRPCDetId : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(testRPCDetId); CPPUNIT_TEST(testOne); + CPPUNIT_TEST(testGasId); CPPUNIT_TEST(testFail); CPPUNIT_TEST(testMemberOperators); CPPUNIT_TEST_SUITE_END(); public: - void setUp() {} + void setUp(); void tearDown() {} void testOne(); + void testGasId(); void testFail(); void testMemberOperators(); + +private: + RPCCompDetId rpcgasid_; }; ///registration of the test so that the runner can find it CPPUNIT_TEST_SUITE_REGISTRATION(testRPCDetId); +void testRPCDetId::setUp() { rpcgasid_ = RPCCompDetId("WM2_S04_RB4R", 0); } + void testRPCDetId::testOne() { for (int region = RPCDetId::minRegionId; region <= RPCDetId::maxRegionId; ++region) { const int minRing(0 != region ? RPCDetId::minRingForwardId : RPCDetId::minRingBarrelId); @@ -65,6 +75,26 @@ void testRPCDetId::testOne() { } } +void testRPCDetId::testGasId() { + std::cout << rpcgasid_ << " rawid = " << rpcgasid_.rawId() << std::endl; + std::cout << "Region = " << rpcgasid_.region() << std::endl; + std::cout << "Ring or Wheel = " << rpcgasid_.ring() << " - Wheel = " << rpcgasid_.wheel() << std::endl; + std::cout << "Station or Disk = " << rpcgasid_.station() << " - Disk = " << rpcgasid_.disk() << std::endl; + std::cout << "Sector = " << rpcgasid_.sector() << std::endl; + std::cout << "Layer = " << rpcgasid_.layer() << std::endl; + std::cout << "SubSector = " << rpcgasid_.subsector() << std::endl; + std::cout << std::setw(100) << std::setfill('-') << std::endl; + std::cout << "ok" << std::endl; + RPCCompDetId check(rpcgasid_.rawId()); + std::cout << check << " rawid = " << check.rawId() << std::endl; + std::cout << "Region = " << check.region() << std::endl; + std::cout << "Ring or Wheel = " << check.ring() << " - Wheel = " << check.wheel() << std::endl; + std::cout << "Station or Disk = " << check.station() << " - Disk = " << check.disk() << std::endl; + std::cout << "Sector = " << check.sector() << std::endl; + std::cout << "Layer = " << check.layer() << std::endl; + std::cout << "SubSector = " << check.subsector() << std::endl; +} + void testRPCDetId::testFail() { // contruct using an invalid input index try { diff --git a/DataFormats/ParticleFlowReco/BuildFile.xml b/DataFormats/ParticleFlowReco/BuildFile.xml index 194195cdf31cd..7503218437353 100644 --- a/DataFormats/ParticleFlowReco/BuildFile.xml +++ b/DataFormats/ParticleFlowReco/BuildFile.xml @@ -7,7 +7,6 @@ - diff --git a/DataFormats/VertexReco/test/BuildFile.xml b/DataFormats/VertexReco/test/BuildFile.xml index c4a9b165bd1a3..23b6edbb1fbf4 100644 --- a/DataFormats/VertexReco/test/BuildFile.xml +++ b/DataFormats/VertexReco/test/BuildFile.xml @@ -4,8 +4,6 @@ - - diff --git a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc index 6975dc58d13e8..574538e765cb0 100644 --- a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc +++ b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc @@ -9,7 +9,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/BeamSpot/interface/BeamSpot.h" diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc index c1bd20f093162..853c7f0898d6f 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastTrackDeDxProducer.cc @@ -30,7 +30,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "DataFormats/Common/interface/ValueMap.h" diff --git a/FastSimulation/TrackingRecHitProducer/interface/PixelTemplateSmearerBase.h b/FastSimulation/TrackingRecHitProducer/interface/PixelTemplateSmearerBase.h index 9446c2103aa5e..9dd5a6d7904c2 100644 --- a/FastSimulation/TrackingRecHitProducer/interface/PixelTemplateSmearerBase.h +++ b/FastSimulation/TrackingRecHitProducer/interface/PixelTemplateSmearerBase.h @@ -19,7 +19,7 @@ // Geometry #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" // template object #include "CondFormats/SiPixelTransient/interface/SiPixelTemplate.h" diff --git a/FastSimulation/TrackingRecHitProducer/plugins/PixelTemplateSmearerPlugin.cc b/FastSimulation/TrackingRecHitProducer/plugins/PixelTemplateSmearerPlugin.cc index ccc78420f17bc..ce4a2459d87f6 100644 --- a/FastSimulation/TrackingRecHitProducer/plugins/PixelTemplateSmearerPlugin.cc +++ b/FastSimulation/TrackingRecHitProducer/plugins/PixelTemplateSmearerPlugin.cc @@ -6,7 +6,7 @@ #include "FastSimulation/TrackingRecHitProducer/interface/PixelResolutionHistograms.h" // Geometry -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" /// If we ever need to port back to 9X: #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" diff --git a/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc b/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc index e55ab63f616bb..f0bf2e66f56c5 100644 --- a/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc +++ b/FastSimulation/TrackingRecHitProducer/src/PixelTemplateSmearerBase.cc @@ -20,7 +20,7 @@ // Geometry /// #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h" // Keep... needed if we backport to CMSSW_9 -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/GeometryVector/interface/LocalPoint.h" #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h" diff --git a/Fireworks/Geometry/plugins/ValidateGeometry.cc b/Fireworks/Geometry/plugins/ValidateGeometry.cc index 51fe920873b4a..ce1dfd4a74526 100644 --- a/Fireworks/Geometry/plugins/ValidateGeometry.cc +++ b/Fireworks/Geometry/plugins/ValidateGeometry.cc @@ -25,7 +25,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" diff --git a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc index 18868c6f4ebdf..64044ee94ee0a 100644 --- a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc +++ b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc @@ -26,7 +26,7 @@ #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc index baaa65bb71d16..82f1d2b994afc 100644 --- a/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc +++ b/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc @@ -34,7 +34,7 @@ #include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" diff --git a/DataFormats/MuonDetId/test/CSCDetIdAnalyzer.cc b/Geometry/CSCGeometry/test/stubs/CSCDetIdAnalyzer.cc similarity index 100% rename from DataFormats/MuonDetId/test/CSCDetIdAnalyzer.cc rename to Geometry/CSCGeometry/test/stubs/CSCDetIdAnalyzer.cc diff --git a/Geometry/CommonDetUnit/BuildFile.xml b/Geometry/CommonDetUnit/BuildFile.xml index a8097b9391908..9009f44e493e1 100644 --- a/Geometry/CommonDetUnit/BuildFile.xml +++ b/Geometry/CommonDetUnit/BuildFile.xml @@ -4,4 +4,4 @@ - + diff --git a/Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h b/Geometry/CommonDetUnit/interface/PixelGeomDetType.h similarity index 100% rename from Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h rename to Geometry/CommonDetUnit/interface/PixelGeomDetType.h diff --git a/Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h b/Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h similarity index 88% rename from Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h rename to Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h index 78f7759e0348b..cd5545c8eac79 100644 --- a/Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h +++ b/Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h @@ -1,9 +1,9 @@ -#ifndef Geometry_TrackerGeometryBuilder_PixelGeomDetUnit_H -#define Geometry_TrackerGeometryBuilder_PixelGeomDetUnit_H +#ifndef Geometry_CommonDetUnit_PixelGeomDetUnit_H +#define Geometry_CommonDetUnit_PixelGeomDetUnit_H #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h" #include "DataFormats/DetId/interface/DetId.h" -#include "Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h" +#include "Geometry/CommonTopologies/interface/ProxyPixelTopology.h" class PixelGeomDetType; class PixelTopology; @@ -46,7 +46,7 @@ class PixelGeomDetUnit final : public TrackerGeomDet { bool isLeaf() const override { return true; } private: - /// set the SurfaceDeformation for this StripGeomDetUnit to proxy topology. + /// set the SurfaceDeformation for this StripGeomDet to proxy topology. void setSurfaceDeformation(const SurfaceDeformation* deformation) override; std::unique_ptr theTopology; diff --git a/Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h b/Geometry/CommonDetUnit/interface/StackGeomDet.h similarity index 87% rename from Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h rename to Geometry/CommonDetUnit/interface/StackGeomDet.h index c13f2ec521d21..c87410a374f0f 100644 --- a/Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h +++ b/Geometry/CommonDetUnit/interface/StackGeomDet.h @@ -1,5 +1,5 @@ -#ifndef Geometry_TrackerGeometryBuilder_StackGeomDet_H -#define Geometry_TrackerGeometryBuilder_StackGeomDet_H +#ifndef Geometry_CommonDetUnit_StackGeomDet_H +#define Geometry_CommonDetUnit_StackGeomDet_H #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h" #include "DataFormats/DetId/interface/DetId.h" diff --git a/Geometry/CommonDetUnit/src/PixelGeomDetType.cc b/Geometry/CommonDetUnit/src/PixelGeomDetType.cc new file mode 100644 index 0000000000000..f45be58383173 --- /dev/null +++ b/Geometry/CommonDetUnit/src/PixelGeomDetType.cc @@ -0,0 +1,9 @@ +// #include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" + +// void PixelGeomDetType::setTopology( TopologyType* topol) +// { +// if (topol != theTopology) { +// delete theTopology; +// theTopology = topol; +// } +// } diff --git a/Geometry/TrackerGeometryBuilder/src/PixelGeomDetUnit.cc b/Geometry/CommonDetUnit/src/PixelGeomDetUnit.cc similarity index 83% rename from Geometry/TrackerGeometryBuilder/src/PixelGeomDetUnit.cc rename to Geometry/CommonDetUnit/src/PixelGeomDetUnit.cc index 527511d34aa8d..624d96273be23 100644 --- a/Geometry/TrackerGeometryBuilder/src/PixelGeomDetUnit.cc +++ b/Geometry/CommonDetUnit/src/PixelGeomDetUnit.cc @@ -1,5 +1,5 @@ -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h" diff --git a/Geometry/TrackerGeometryBuilder/src/StackGeomDet.cc b/Geometry/CommonDetUnit/src/StackGeomDet.cc similarity index 87% rename from Geometry/TrackerGeometryBuilder/src/StackGeomDet.cc rename to Geometry/CommonDetUnit/src/StackGeomDet.cc index 52d821542da09..04f0cb181bb89 100644 --- a/Geometry/TrackerGeometryBuilder/src/StackGeomDet.cc +++ b/Geometry/CommonDetUnit/src/StackGeomDet.cc @@ -1,4 +1,4 @@ -#include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" +#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" StackGeomDet::StackGeomDet(BoundPlane* sp, const GeomDetUnit* lowerDet, diff --git a/Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h b/Geometry/CommonTopologies/interface/ProxyPixelTopology.h similarity index 96% rename from Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h rename to Geometry/CommonTopologies/interface/ProxyPixelTopology.h index 89c11f7444e63..542f57f339198 100644 --- a/Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h +++ b/Geometry/CommonTopologies/interface/ProxyPixelTopology.h @@ -1,5 +1,5 @@ -#ifndef Geometry_TrackerTopology_ProxyPixelTopology_H -#define Geometry_TrackerTopology_ProxyPixelTopology_H +#ifndef Geometry_CommonTopologies_ProxyPixelTopology_H +#define Geometry_CommonTopologies_ProxyPixelTopology_H /// ProxyStripTopology /// @@ -21,7 +21,7 @@ #include "Geometry/CommonTopologies/interface/SurfaceDeformation.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" class Plane; diff --git a/Geometry/TrackerGeometryBuilder/src/ProxyPixelTopology.cc b/Geometry/CommonTopologies/src/ProxyPixelTopology.cc similarity index 98% rename from Geometry/TrackerGeometryBuilder/src/ProxyPixelTopology.cc rename to Geometry/CommonTopologies/src/ProxyPixelTopology.cc index ec4dcd21f7445..9022aa9f4d127 100644 --- a/Geometry/TrackerGeometryBuilder/src/ProxyPixelTopology.cc +++ b/Geometry/CommonTopologies/src/ProxyPixelTopology.cc @@ -1,8 +1,8 @@ #include "DataFormats/GeometrySurface/interface/BoundPlane.h" #include "DataFormats/GeometrySurface/interface/Bounds.h" -#include "Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonTopologies/interface/ProxyPixelTopology.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" //////////////////////////////////////////////////////////////////////////////// ProxyPixelTopology::ProxyPixelTopology(PixelGeomDetType const *type, BoundPlane *bp) diff --git a/DataFormats/MuonDetId/test/GEMDetIdAnalyzer.cc b/Geometry/GEMGeometry/test/GEMDetIdAnalyzer.cc similarity index 100% rename from DataFormats/MuonDetId/test/GEMDetIdAnalyzer.cc rename to Geometry/GEMGeometry/test/GEMDetIdAnalyzer.cc diff --git a/DataFormats/MuonDetId/test/runGEMDetIdAnalysis_cfg.py b/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py similarity index 100% rename from DataFormats/MuonDetId/test/runGEMDetIdAnalysis_cfg.py rename to Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py diff --git a/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc b/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc index 688c00c8a8047..8ed96ed2815ab 100644 --- a/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc +++ b/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc @@ -31,10 +31,10 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/Geometry/TrackerGeometryBuilder/src/PixelGeomDetType.cc b/Geometry/TrackerGeometryBuilder/src/PixelGeomDetType.cc deleted file mode 100644 index 7c6a04b3a9a0e..0000000000000 --- a/Geometry/TrackerGeometryBuilder/src/PixelGeomDetType.cc +++ /dev/null @@ -1,10 +0,0 @@ -// #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" - - -// void PixelGeomDetType::setTopology( TopologyType* topol) -// { -// if (topol != theTopology) { -// delete theTopology; -// theTopology = topol; -// } -// } diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc index 2dd8c32043f7a..cc32b9c65aff8 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerGeomBuilderFromGeometricDet.cc @@ -3,9 +3,9 @@ #include "Geometry/TrackerGeometryBuilder/interface/PlaneBuilderForGluedDet.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" diff --git a/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc b/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc index f845a338bf766..21724812477c4 100644 --- a/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc +++ b/Geometry/TrackerGeometryBuilder/test/ModuleInfo.cc @@ -33,10 +33,10 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc index 4d46d35570499..b3fe3c3760ed0 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerDigiGeometryAnalyzer.cc @@ -34,10 +34,10 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "DataFormats/GeometrySurface/interface/MediumProperties.h" diff --git a/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc b/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc index ab2df9a21be4d..a61070315436c 100644 --- a/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc +++ b/Geometry/TrackerGeometryBuilder/test/TrackerMapTool.cc @@ -39,10 +39,10 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" // diff --git a/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc b/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc index b7b7dc0945004..b2e458ae0e2c4 100644 --- a/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc +++ b/Geometry/TrackerNumberingBuilder/test/ModuleNumbering.cc @@ -31,10 +31,10 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc b/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc index 53d3a23c7a3c4..64275d8953319 100644 --- a/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc +++ b/HLTrigger/special/plugins/HLTPixelClusterShapeFilter.cc @@ -48,7 +48,7 @@ class HLTPixelClusterShapeFilter : public HLTFilter { #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/L1Trigger/L1TMuon/src/TTGeometryTranslator.cc b/L1Trigger/L1TMuon/src/TTGeometryTranslator.cc index 78896f4195781..b9a729854419d 100644 --- a/L1Trigger/L1TMuon/src/TTGeometryTranslator.cc +++ b/L1Trigger/L1TMuon/src/TTGeometryTranslator.cc @@ -8,7 +8,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "MagneticField/Engine/interface/MagneticField.h" diff --git a/L1Trigger/TrackTrigger/interface/StubPtConsistency.h b/L1Trigger/TrackTrigger/interface/StubPtConsistency.h index 3eb4a49e2a7e4..537b37fb3278e 100644 --- a/L1Trigger/TrackTrigger/interface/StubPtConsistency.h +++ b/L1Trigger/TrackTrigger/interface/StubPtConsistency.h @@ -4,8 +4,8 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" diff --git a/L1Trigger/TrackTrigger/interface/TTStubAlgorithm_official.h b/L1Trigger/TrackTrigger/interface/TTStubAlgorithm_official.h index bf87e3c74f8aa..c6d1ea6038514 100644 --- a/L1Trigger/TrackTrigger/interface/TTStubAlgorithm_official.h +++ b/L1Trigger/TrackTrigger/interface/TTStubAlgorithm_official.h @@ -25,7 +25,7 @@ #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h" #include "Geometry/CommonTopologies/interface/Topology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include diff --git a/L1Trigger/TrackTrigger/plugins/TTClusterBuilder.h b/L1Trigger/TrackTrigger/plugins/TTClusterBuilder.h index 943326258c697..0d3fabb7361e7 100644 --- a/L1Trigger/TrackTrigger/plugins/TTClusterBuilder.h +++ b/L1Trigger/TrackTrigger/plugins/TTClusterBuilder.h @@ -25,7 +25,7 @@ #include "L1Trigger/TrackTrigger/interface/TTClusterAlgorithm.h" #include "L1Trigger/TrackTrigger/interface/TTClusterAlgorithmRecord.h" #include "Geometry/CommonTopologies/interface/Topology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/Common/interface/DetSetVectorNew.h" diff --git a/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h b/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h index 3983ef2376bf6..3d9d90c8b2082 100644 --- a/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h +++ b/L1Trigger/TrackTrigger/plugins/TTStubBuilder.h @@ -24,7 +24,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "L1Trigger/TrackTrigger/interface/TTStubAlgorithm.h" diff --git a/L1Trigger/TrackTrigger/test/AnalyzerClusterStub.cc b/L1Trigger/TrackTrigger/test/AnalyzerClusterStub.cc index fec4baaa11623..5dece77573e20 100644 --- a/L1Trigger/TrackTrigger/test/AnalyzerClusterStub.cc +++ b/L1Trigger/TrackTrigger/test/AnalyzerClusterStub.cc @@ -24,7 +24,7 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" #include "Geometry/CommonTopologies/interface/Topology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include #include diff --git a/L1Trigger/TrackTrigger/test/AnalyzerPrintGeomInfo.cc b/L1Trigger/TrackTrigger/test/AnalyzerPrintGeomInfo.cc index 5048943dcf927..893a0d74077f4 100644 --- a/L1Trigger/TrackTrigger/test/AnalyzerPrintGeomInfo.cc +++ b/L1Trigger/TrackTrigger/test/AnalyzerPrintGeomInfo.cc @@ -12,7 +12,7 @@ #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/SiPixelDetId/interface/PXBDetId.h" diff --git a/L1Trigger/TrackTrigger/test/AnalyzerSimHitMaps.cc b/L1Trigger/TrackTrigger/test/AnalyzerSimHitMaps.cc index 2bf8382ca1e52..0b8ba242c1bdc 100644 --- a/L1Trigger/TrackTrigger/test/AnalyzerSimHitMaps.cc +++ b/L1Trigger/TrackTrigger/test/AnalyzerSimHitMaps.cc @@ -12,7 +12,7 @@ #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" diff --git a/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc b/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc index a32a43af436c8..1f0c291c9a699 100644 --- a/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc +++ b/RecoBTag/PixelCluster/plugins/PixelClusterTagInfoProducer.cc @@ -60,7 +60,7 @@ // Geometry #include "DataFormats/Math/interface/deltaR.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc index c542d9e77240e..c754081258c20 100644 --- a/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc +++ b/RecoHI/HiCentralityAlgos/plugins/CentralityProducer.cc @@ -39,7 +39,7 @@ #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" using namespace std; using namespace edm; diff --git a/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc b/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc index b11760440fbf5..a38d62e98ee2e 100644 --- a/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc +++ b/RecoHI/HiCentralityAlgos/plugins/ClusterCompatibilityProducer.cc @@ -24,7 +24,7 @@ #include "DataFormats/HeavyIonEvent/interface/ClusterCompatibility.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc b/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc index 508dc76396e57..a69eb63239e7b 100644 --- a/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc +++ b/RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.cc @@ -9,7 +9,7 @@ #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc index e9be4810843f8..c25fa12d63390 100644 --- a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc +++ b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc @@ -9,7 +9,7 @@ #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h index 02838c7a49bf7..24cc615a467fc 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h +++ b/RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h @@ -5,7 +5,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc b/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc index 300aee389fa93..5d7206488181d 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/plugins/Phase2TrackerRecHits.cc @@ -13,7 +13,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" diff --git a/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc b/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc index 5b5aac9d2c0a8..702044ed67b8f 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/src/Phase2StripCPEGeometric.cc @@ -1,6 +1,6 @@ #include "RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPEGeometric.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" // currently (?) use Pixel classes for GeomDetUnit and Topology diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc index d19d197d15738..b02b285a8586c 100644 --- a/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc +++ b/RecoLocalTracker/Phase2TrackerRecHits/test/RecHitsValidation.cc @@ -16,7 +16,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc index 1b35c1d759a64..8747bd5504879 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc @@ -17,7 +17,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h index a08f14a0be3d0..76b645b0281a4 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h +++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizerAlgorithm.h @@ -6,7 +6,7 @@ #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Phase2TrackerClusterizerArray.h" diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc index 74faaed371a88..ce2acc34c4ce7 100644 --- a/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc +++ b/RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc @@ -16,7 +16,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc index 0dd9ae6d97756..0871fececa24c 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/PixelThresholdClusterizer.cc @@ -24,7 +24,7 @@ #include "SiPixelArrayBuffer.h" #include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibrationOffline.h" // Geometry -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" //#include "Geometry/CommonTopologies/RectangularPixelTopology.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc index 12b3c34741fd5..15a6536ca644b 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc @@ -17,7 +17,7 @@ // Geometry #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" // Data Formats #include "DataFormats/Common/interface/DetSetVector.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc index e5f766e96ccf1..30581536b547a 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/ReadPixClusters.cc @@ -33,8 +33,8 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc index fe1952b6e81b2..ed3bd8d86fe92 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestClusters.cc @@ -33,8 +33,8 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc index 08d7259afbc0f..2f3691219de4a 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestPixTracks.cc @@ -1,6 +1,6 @@ // File: ReadPixClusters.cc // Description: TO test the pixel clusters with tracks (full) -// Author: Danek Kotlinski +// Author: Danek Kotlinski // Creation Date: Initial version. 3/06 // //-------------------------------------------- @@ -30,12 +30,12 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/DetId/interface/DetId.h" -#include "DataFormats/SiPixelDetId/interface/PXBDetId.h" -#include "DataFormats/SiPixelDetId/interface/PXFDetId.h" +#include "DataFormats/SiPixelDetId/interface/PXBDetId.h" +#include "DataFormats/SiPixelDetId/interface/PXFDetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" @@ -56,8 +56,7 @@ #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" #include "FWCore/Common/interface/TriggerNames.h" - -// For tracks +// For tracks #include "DataFormats/TrackReco/interface/Track.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" @@ -75,7 +74,6 @@ //#include "Alignment/OfflineValidation/interface/TrackerValidationVariables.h" - //#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" //#include "TrackingTools/PatternTools/interface/Trajectory.h" //#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" @@ -103,7 +101,6 @@ #include #include - #define HISTOS //#define L1 //#define HLT @@ -111,21 +108,20 @@ using namespace std; class TestPixTracks : public edm::EDAnalyzer { - public: - - explicit TestPixTracks(const edm::ParameterSet& conf); +public: + explicit TestPixTracks(const edm::ParameterSet &conf); virtual ~TestPixTracks(); - virtual void analyze(const edm::Event& e, const edm::EventSetup& c) override; - virtual void beginRun(const edm::EventSetup& iSetup) override; + virtual void analyze(const edm::Event &e, const edm::EventSetup &c) override; + virtual void beginRun(const edm::EventSetup &iSetup) override; virtual void beginJob() override; virtual void endJob() override; - - private: + +private: edm::ParameterSet conf_; edm::InputTag src_; //const static bool PRINT = false; bool PRINT; - float countTracks, countGoodTracks, countTracksInPix, countPVs, countEvents, countLumi; + float countTracks, countGoodTracks, countTracksInPix, countPVs, countEvents, countLumi; //TFile* hFile; //TH1D *hdetunit; @@ -134,29 +130,27 @@ class TestPixTracks : public edm::EDAnalyzer { //*hladder1id,*hladder2id,*hladder3id, //*hz1id,*hz2id,*hz3id; - TH1D *hcharge1,*hcharge2, *hcharge3, *hcharge; - TH1D *hpixcharge1,*hpixcharge2, *hpixcharge3, *hpixcharge; - TH1D *hcols1,*hcols2,*hcols3,*hrows1,*hrows2,*hrows3; - TH1D *hsize1,*hsize2,*hsize3, - *hsizex1,*hsizex2,*hsizex3, - *hsizey1,*hsizey2,*hsizey3; + TH1D *hcharge1, *hcharge2, *hcharge3, *hcharge; + TH1D *hpixcharge1, *hpixcharge2, *hpixcharge3, *hpixcharge; + TH1D *hcols1, *hcols2, *hcols3, *hrows1, *hrows2, *hrows3; + TH1D *hsize1, *hsize2, *hsize3, *hsizex1, *hsizex2, *hsizex3, *hsizey1, *hsizey2, *hsizey3; - TH1D *hclusPerTrk1,*hclusPerTrk2,*hclusPerTrk3; - TH1D *hclusPerLay1,*hclusPerLay2,*hclusPerLay3; - TH1D *hpixPerLay1,*hpixPerLay2,*hpixPerLay3; + TH1D *hclusPerTrk1, *hclusPerTrk2, *hclusPerTrk3; + TH1D *hclusPerLay1, *hclusPerLay2, *hclusPerLay3; + TH1D *hpixPerLay1, *hpixPerLay2, *hpixPerLay3; //TH1D *hdetsPerLay1,*hdetsPerLay2,*hdetsPerLay3; //TH1D *hdetr, *hdetz; // TH1D *hcolsB, *hrowsB, *hcolsF, *hrowsF; - TH2F *hDetMap1, *hDetMap2, *hDetMap3; // clusters + TH2F *hDetMap1, *hDetMap2, *hDetMap3; // clusters //TH2F *hpixDetMap1, *hpixDetMap2, *hpixDetMap3; TH2F *hcluDetMap1, *hcluDetMap2, *hcluDetMap3; TH2F *hpvxy, *hclusMap1, *hclusMap2, *hclusMap3; TH1D *hpvz, *hpvr, *hNumPv, *hNumPvClean; - TH1D *hPt, *hEta, *hDz, *hD0,*hzdiff; - + TH1D *hPt, *hEta, *hDz, *hD0, *hzdiff; + //TH1D *hncharge1,*hncharge2, *hncharge3; //TH1D *hchargeMonoPix1,*hchargeMonoPix2, *hchargeMonoPix3; // TH1D *hnpixcharge1,*hnpixcharge2, *hnpixcharge3; @@ -166,44 +160,42 @@ class TestPixTracks : public edm::EDAnalyzer { TH1D *hclusBpix, *hpixBpix; TH1D *htracks, *htracksGood, *htracksGoodInPix; - TProfile *hclumult1, *hclumult2, *hclumult3; + TProfile *hclumult1, *hclumult2, *hclumult3; TProfile *hclumultx1, *hclumultx2, *hclumultx3; TProfile *hclumulty1, *hclumulty2, *hclumulty3; - TProfile *hcluchar1, *hcluchar2, *hcluchar3; - TProfile *hpixchar1, *hpixchar2, *hpixchar3; + TProfile *hcluchar1, *hcluchar2, *hcluchar3; + TProfile *hpixchar1, *hpixchar2, *hpixchar3; - TProfile *htracksls, *hpvsls, *htrackslsn, *hpvslsn, *hintgl, *hinstl, *hbeam1, *hbeam2; + TProfile *htracksls, *hpvsls, *htrackslsn, *hpvslsn, *hintgl, *hinstl, *hbeam1, *hbeam2; TH1D *hlumi, *hlumi0, *hbx, *hbx0; - }; ///////////////////////////////////////////////////////////////// // Contructor, -TestPixTracks::TestPixTracks(edm::ParameterSet const& conf) -// : conf_(conf), src_(conf.getParameter( "src" )) { } - : conf_(conf) { - - PRINT = conf.getUntrackedParameter("Verbosity",false); - src_ = conf.getParameter( "src" ); +TestPixTracks::TestPixTracks(edm::ParameterSet const &conf) + // : conf_(conf), src_(conf.getParameter( "src" )) { } + : conf_(conf) { + PRINT = conf.getUntrackedParameter("Verbosity", false); + src_ = conf.getParameter("src"); //if(PRINT) cout<<" Construct "<make( "hz2id", "Z-index id L2", 10, 0., 10.); //hz3id = fs->make( "hz3id", "Z-index id L3", 10, 0., 10.); - int sizeH=20; + int sizeH = 20; float lowH = -0.5; float highH = 19.5; - hclusPerTrk1 = fs->make( "hclusPerTrk1", "Clus per track l1", - sizeH, lowH, highH); - hclusPerTrk2 = fs->make( "hclusPerTrk2", "Clus per track l2", - sizeH, lowH, highH); - hclusPerTrk3 = fs->make( "hclusPerTrk3", "Clus per track l3", - sizeH, lowH, highH); + hclusPerTrk1 = fs->make("hclusPerTrk1", "Clus per track l1", sizeH, lowH, highH); + hclusPerTrk2 = fs->make("hclusPerTrk2", "Clus per track l2", sizeH, lowH, highH); + hclusPerTrk3 = fs->make("hclusPerTrk3", "Clus per track l3", sizeH, lowH, highH); - sizeH=2000; + sizeH = 2000; highH = 1999.5; - hclusPerLay1 = fs->make( "hclusPerLay1", "Clus per layer l1", - sizeH, lowH, highH); - hclusPerLay2 = fs->make( "hclusPerLay2", "Clus per layer l2", - sizeH, lowH, highH); - hclusPerLay3 = fs->make( "hclusPerLay3", "Clus per layer l3", - sizeH, lowH, highH); + hclusPerLay1 = fs->make("hclusPerLay1", "Clus per layer l1", sizeH, lowH, highH); + hclusPerLay2 = fs->make("hclusPerLay2", "Clus per layer l2", sizeH, lowH, highH); + hclusPerLay3 = fs->make("hclusPerLay3", "Clus per layer l3", sizeH, lowH, highH); highH = 9999.5; - hpixPerLay1 = fs->make( "hpixPerLay1", "Pix per layer l1", - sizeH, lowH, highH); - hpixPerLay2 = fs->make( "hpixPerLay2", "Pix per layer l2", - sizeH, lowH, highH); - hpixPerLay3 = fs->make( "hpixPerLay3", "Pix per layer l3", - sizeH, lowH, highH); + hpixPerLay1 = fs->make("hpixPerLay1", "Pix per layer l1", sizeH, lowH, highH); + hpixPerLay2 = fs->make("hpixPerLay2", "Pix per layer l2", sizeH, lowH, highH); + hpixPerLay3 = fs->make("hpixPerLay3", "Pix per layer l3", sizeH, lowH, highH); //hdetsPerLay1 = fs->make( "hdetsPerLay1", "Full dets per layer l1", // 161, -0.5, 160.5); @@ -254,159 +237,141 @@ void TestPixTracks::beginJob() { // 353, -0.5, 352.5); //hdetsPerLay2 = fs->make( "hdetsPerLay2", "Full dets per layer l2", // 257, -0.5, 256.5); - - hcharge1 = fs->make( "hcharge1", "Clu charge l1", 400, 0.,200.); //in ke - hcharge2 = fs->make( "hcharge2", "Clu charge l2", 400, 0.,200.); - hcharge3 = fs->make( "hcharge3", "Clu charge l3", 400, 0.,200.); + + hcharge1 = fs->make("hcharge1", "Clu charge l1", 400, 0., 200.); //in ke + hcharge2 = fs->make("hcharge2", "Clu charge l2", 400, 0., 200.); + hcharge3 = fs->make("hcharge3", "Clu charge l3", 400, 0., 200.); //hchargeMonoPix1 = fs->make( "hchargeMonoPix1", "Clu charge l1 MonPix", 200, 0.,100.); //in ke //hchargeMonoPix2 = fs->make( "hchargeMonoPix2", "Clu charge l2 MonPix", 200, 0.,100.); //hchargeMonoPix3 = fs->make( "hchargeMonoPix3", "Clu charge l3 MonPix", 200, 0.,100.); - + //hncharge1 = fs->make( "hncharge1", "Noise charge l1", 200, 0.,100.); //in ke //hncharge2 = fs->make( "hncharge2", "Noise charge l2", 200, 0.,100.); //hncharge3 = fs->make( "hncharge3", "Noise charge l3", 200, 0.,100.); - + //hpixcharge1 = fs->make( "hpixcharge1", "Pix charge l1", 100, 0.,50.); //in ke //hpixcharge2 = fs->make( "hpixcharge2", "Pix charge l2", 100, 0.,50.); //hpixcharge3 = fs->make( "hpixcharge3", "Pix charge l3", 100, 0.,50.); - + //hnpixcharge1 = fs->make( "hnpixcharge1", "Noise pix charge l1", 100, 0.,50.); //in ke //hnpixcharge2 = fs->make( "hnpixcharge2", "Noise pix charge l2", 100, 0.,50.); //hnpixcharge3 = fs->make( "hnpixcharge3", "Noise pix charge l3", 100, 0.,50.); //hpixcharge = fs->make( "hpixcharge", "Clu charge", 100, 0.,50.); //hcharge = fs->make( "hcharge", "Pix charge", 100, 0.,50.); - - hcols1 = fs->make( "hcols1", "Layer 1 cols", 500,-0.5,499.5); - hcols2 = fs->make( "hcols2", "Layer 2 cols", 500,-0.5,499.5); - hcols3 = fs->make( "hcols3", "Layer 3 cols", 500,-0.5,499.5); - - hrows1 = fs->make( "hrows1", "Layer 1 rows", 200,-0.5,199.5); - hrows2 = fs->make( "hrows2", "Layer 2 rows", 200,-0.5,199.5); - hrows3 = fs->make( "hrows3", "layer 3 rows", 200,-0.5,199.5); - - hsize1 = fs->make( "hsize1", "layer 1 clu size",100,-0.5,99.5); - hsize2 = fs->make( "hsize2", "layer 2 clu size",100,-0.5,99.5); - hsize3 = fs->make( "hsize3", "layer 3 clu size",100,-0.5,99.5); - hsizex1 = fs->make( "hsizex1", "lay1 clu size in x", - 20,-0.5,19.5); - hsizex2 = fs->make( "hsizex2", "lay2 clu size in x", - 20,-0.5,19.5); - hsizex3 = fs->make( "hsizex3", "lay3 clu size in x", - 20,-0.5,19.5); - hsizey1 = fs->make( "hsizey1", "lay1 clu size in y", - 30,-0.5,29.5); - hsizey2 = fs->make( "hsizey2", "lay2 clu size in y", - 30,-0.5,29.5); - hsizey3 = fs->make( "hsizey3", "lay3 clu size in y", - 30,-0.5,29.5); - - - hDetMap1 = fs->make( "hDetMap1", "layer 1 clus map", - 9,0.,9.,23,0.,23.); - hDetMap2 = fs->make( "hDetMap2", "layer 2 clus map", - 9,0.,9.,33,0.,33.); - hDetMap3 = fs->make( "hDetMap3", "layer 3 clus map", - 9,0.,9.,45,0.,45.); + + hcols1 = fs->make("hcols1", "Layer 1 cols", 500, -0.5, 499.5); + hcols2 = fs->make("hcols2", "Layer 2 cols", 500, -0.5, 499.5); + hcols3 = fs->make("hcols3", "Layer 3 cols", 500, -0.5, 499.5); + + hrows1 = fs->make("hrows1", "Layer 1 rows", 200, -0.5, 199.5); + hrows2 = fs->make("hrows2", "Layer 2 rows", 200, -0.5, 199.5); + hrows3 = fs->make("hrows3", "layer 3 rows", 200, -0.5, 199.5); + + hsize1 = fs->make("hsize1", "layer 1 clu size", 100, -0.5, 99.5); + hsize2 = fs->make("hsize2", "layer 2 clu size", 100, -0.5, 99.5); + hsize3 = fs->make("hsize3", "layer 3 clu size", 100, -0.5, 99.5); + hsizex1 = fs->make("hsizex1", "lay1 clu size in x", 20, -0.5, 19.5); + hsizex2 = fs->make("hsizex2", "lay2 clu size in x", 20, -0.5, 19.5); + hsizex3 = fs->make("hsizex3", "lay3 clu size in x", 20, -0.5, 19.5); + hsizey1 = fs->make("hsizey1", "lay1 clu size in y", 30, -0.5, 29.5); + hsizey2 = fs->make("hsizey2", "lay2 clu size in y", 30, -0.5, 29.5); + hsizey3 = fs->make("hsizey3", "lay3 clu size in y", 30, -0.5, 29.5); + + hDetMap1 = fs->make("hDetMap1", "layer 1 clus map", 9, 0., 9., 23, 0., 23.); + hDetMap2 = fs->make("hDetMap2", "layer 2 clus map", 9, 0., 9., 33, 0., 33.); + hDetMap3 = fs->make("hDetMap3", "layer 3 clus map", 9, 0., 9., 45, 0., 45.); //hpixDetMap1 = fs->make( "hpixDetMap1", "pix det layer 1", // 416,0.,416.,160,0.,160.); //hpixDetMap2 = fs->make( "hpixDetMap2", "pix det layer 2", // 416,0.,416.,160,0.,160.); //hpixDetMap3 = fs->make( "hpixDetMap3", "pix det layer 3", // 416,0.,416.,160,0.,160.); - hcluDetMap1 = fs->make( "hcluDetMap1", "clu det layer 1", - 416,0.,416.,160,0.,160.); - hcluDetMap2 = fs->make( "hcluDetMap2", "clu det layer 1", - 416,0.,416.,160,0.,160.); - hcluDetMap3 = fs->make( "hcluDetMap3", "clu det layer 1", - 416,0.,416.,160,0.,160.); - - htracksGoodInPix = fs->make( "htracksGoodInPix", "count good tracks in pix",2000,-0.5,1999.5); - htracksGood = fs->make( "htracksGood", "count good tracks",2000,-0.5,1999.5); - htracks = fs->make( "htracks", "count tracks",2000,-0.5,1999.5); - hclusBpix = fs->make( "hclusBpix", "count clus in bpix",200,-0.5,1999.5); - hpixBpix = fs->make( "hpixBpix", "count pixels",200,-0.5,1999.5); - - hpvxy = fs->make( "hpvxy", "pv xy",100,-1.,1.,100,-1.,1.); - hpvz = fs->make( "hpvz", "pv z",1000,-50.,50.); - hpvr = fs->make( "hpvr", "pv r",100,0.,1.); - hNumPv = fs->make( "hNumPv", "num of pv",100,0.,100.); - hNumPvClean = fs->make( "hNumPvClean", "num of pv clean",100,0.,100.); - - hPt = fs->make( "hPt", "pt",100,0.,100.); - hEta = fs->make( "hEta", "eta",50,-2.5,2.5); - hD0 = fs->make( "hD0", "d0",500,0.,5.); - hDz = fs->make( "hDz", "pt",250,-25.,25.); - hzdiff = fs->make( "hzdiff", "PVz-Trackz",200,-10.,10.); - - hl1a = fs->make("hl1a", "l1a", 128,-0.5,127.5); - hl1t = fs->make("hl1t", "l1t", 128,-0.5,127.5); - hlt1 = fs->make("hlt1","hlt1",256,-0.5,255.5); - - hclumult1 = fs->make("hclumult1","cluster size layer 1",60,-3.,3.,0.0,100.); - hclumult2 = fs->make("hclumult2","cluster size layer 2",60,-3.,3.,0.0,100.); - hclumult3 = fs->make("hclumult3","cluster size layer 3",60,-3.,3.,0.0,100.); - - hclumultx1 = fs->make("hclumultx1","cluster x-size layer 1",60,-3.,3.,0.0,100.); - hclumultx2 = fs->make("hclumultx2","cluster x-size layer 2",60,-3.,3.,0.0,100.); - hclumultx3 = fs->make("hclumultx3","cluster x-size layer 3",60,-3.,3.,0.0,100.); - - hclumulty1 = fs->make("hclumulty1","cluster y-size layer 1",60,-3.,3.,0.0,100.); - hclumulty2 = fs->make("hclumulty2","cluster y-size layer 2",60,-3.,3.,0.0,100.); - hclumulty3 = fs->make("hclumulty3","cluster y-size layer 3",60,-3.,3.,0.0,100.); - - hcluchar1 = fs->make("hcluchar1","cluster char layer 1",60,-3.,3.,0.0,1000.); - hcluchar2 = fs->make("hcluchar2","cluster char layer 2",60,-3.,3.,0.0,1000.); - hcluchar3 = fs->make("hcluchar3","cluster char layer 3",60,-3.,3.,0.0,1000.); - - hpixchar1 = fs->make("hpixchar1","pix char layer 1",60,-3.,3.,0.0,1000.); - hpixchar2 = fs->make("hpixchar2","pix char layer 2",60,-3.,3.,0.0,1000.); - hpixchar3 = fs->make("hpixchar3","pix char layer 3",60,-3.,3.,0.0,1000.); - - hintgl = fs->make("hintgl", "inst lumi vs ls ",1000,0.,3000.,0.0,10000.); - hinstl = fs->make("hinstl", "intg lumi vs ls ",1000,0.,3000.,0.0,100.); - hbeam1 = fs->make("hbeam1", "beam1 vs ls ",1000,0.,3000.,0.0,1000.); - hbeam2 = fs->make("hbeam2", "beam2 vs ls ",1000,0.,3000.,0.0,1000.); - - htracksls = fs->make("htracksls","tracks with pix hits vs ls",1000,0.,3000.,0.0,10000.); - hpvsls = fs->make("hpvsls","pvs vs ls",1000,0.,3000.,0.0,1000.); - htrackslsn = fs->make("htrackslsn","tracks with pix hits/lumi vs ls",1000,0.,3000.,0.0,10000.); - hpvslsn = fs->make("hpvslsn","pvs/lumi vs ls",1000,0.,3000.,0.0,1000.); - - hlumi0 = fs->make("hlumi0", "lumi", 2000,0,2000.); - hlumi = fs->make("hlumi", "lumi", 2000,0,2000.); - hbx0 = fs->make("hbx0", "bx", 4000,0,4000.); - hbx = fs->make("hbx", "bx", 4000,0,4000.); - - hclusMap1 = fs->make("hclusMap1","clus - lay1",260,-26.,26.,350,-3.5,3.5); - hclusMap2 = fs->make("hclusMap2","clus - lay2",260,-26.,26.,350,-3.5,3.5); - hclusMap3 = fs->make("hclusMap3","clus - lay3",260,-26.,26.,350,-3.5,3.5); + hcluDetMap1 = fs->make("hcluDetMap1", "clu det layer 1", 416, 0., 416., 160, 0., 160.); + hcluDetMap2 = fs->make("hcluDetMap2", "clu det layer 1", 416, 0., 416., 160, 0., 160.); + hcluDetMap3 = fs->make("hcluDetMap3", "clu det layer 1", 416, 0., 416., 160, 0., 160.); + + htracksGoodInPix = fs->make("htracksGoodInPix", "count good tracks in pix", 2000, -0.5, 1999.5); + htracksGood = fs->make("htracksGood", "count good tracks", 2000, -0.5, 1999.5); + htracks = fs->make("htracks", "count tracks", 2000, -0.5, 1999.5); + hclusBpix = fs->make("hclusBpix", "count clus in bpix", 200, -0.5, 1999.5); + hpixBpix = fs->make("hpixBpix", "count pixels", 200, -0.5, 1999.5); + + hpvxy = fs->make("hpvxy", "pv xy", 100, -1., 1., 100, -1., 1.); + hpvz = fs->make("hpvz", "pv z", 1000, -50., 50.); + hpvr = fs->make("hpvr", "pv r", 100, 0., 1.); + hNumPv = fs->make("hNumPv", "num of pv", 100, 0., 100.); + hNumPvClean = fs->make("hNumPvClean", "num of pv clean", 100, 0., 100.); + + hPt = fs->make("hPt", "pt", 100, 0., 100.); + hEta = fs->make("hEta", "eta", 50, -2.5, 2.5); + hD0 = fs->make("hD0", "d0", 500, 0., 5.); + hDz = fs->make("hDz", "pt", 250, -25., 25.); + hzdiff = fs->make("hzdiff", "PVz-Trackz", 200, -10., 10.); + + hl1a = fs->make("hl1a", "l1a", 128, -0.5, 127.5); + hl1t = fs->make("hl1t", "l1t", 128, -0.5, 127.5); + hlt1 = fs->make("hlt1", "hlt1", 256, -0.5, 255.5); + + hclumult1 = fs->make("hclumult1", "cluster size layer 1", 60, -3., 3., 0.0, 100.); + hclumult2 = fs->make("hclumult2", "cluster size layer 2", 60, -3., 3., 0.0, 100.); + hclumult3 = fs->make("hclumult3", "cluster size layer 3", 60, -3., 3., 0.0, 100.); + + hclumultx1 = fs->make("hclumultx1", "cluster x-size layer 1", 60, -3., 3., 0.0, 100.); + hclumultx2 = fs->make("hclumultx2", "cluster x-size layer 2", 60, -3., 3., 0.0, 100.); + hclumultx3 = fs->make("hclumultx3", "cluster x-size layer 3", 60, -3., 3., 0.0, 100.); + + hclumulty1 = fs->make("hclumulty1", "cluster y-size layer 1", 60, -3., 3., 0.0, 100.); + hclumulty2 = fs->make("hclumulty2", "cluster y-size layer 2", 60, -3., 3., 0.0, 100.); + hclumulty3 = fs->make("hclumulty3", "cluster y-size layer 3", 60, -3., 3., 0.0, 100.); + + hcluchar1 = fs->make("hcluchar1", "cluster char layer 1", 60, -3., 3., 0.0, 1000.); + hcluchar2 = fs->make("hcluchar2", "cluster char layer 2", 60, -3., 3., 0.0, 1000.); + hcluchar3 = fs->make("hcluchar3", "cluster char layer 3", 60, -3., 3., 0.0, 1000.); + + hpixchar1 = fs->make("hpixchar1", "pix char layer 1", 60, -3., 3., 0.0, 1000.); + hpixchar2 = fs->make("hpixchar2", "pix char layer 2", 60, -3., 3., 0.0, 1000.); + hpixchar3 = fs->make("hpixchar3", "pix char layer 3", 60, -3., 3., 0.0, 1000.); + + hintgl = fs->make("hintgl", "inst lumi vs ls ", 1000, 0., 3000., 0.0, 10000.); + hinstl = fs->make("hinstl", "intg lumi vs ls ", 1000, 0., 3000., 0.0, 100.); + hbeam1 = fs->make("hbeam1", "beam1 vs ls ", 1000, 0., 3000., 0.0, 1000.); + hbeam2 = fs->make("hbeam2", "beam2 vs ls ", 1000, 0., 3000., 0.0, 1000.); + + htracksls = fs->make("htracksls", "tracks with pix hits vs ls", 1000, 0., 3000., 0.0, 10000.); + hpvsls = fs->make("hpvsls", "pvs vs ls", 1000, 0., 3000., 0.0, 1000.); + htrackslsn = fs->make("htrackslsn", "tracks with pix hits/lumi vs ls", 1000, 0., 3000., 0.0, 10000.); + hpvslsn = fs->make("hpvslsn", "pvs/lumi vs ls", 1000, 0., 3000., 0.0, 1000.); + + hlumi0 = fs->make("hlumi0", "lumi", 2000, 0, 2000.); + hlumi = fs->make("hlumi", "lumi", 2000, 0, 2000.); + hbx0 = fs->make("hbx0", "bx", 4000, 0, 4000.); + hbx = fs->make("hbx", "bx", 4000, 0, 4000.); + + hclusMap1 = fs->make("hclusMap1", "clus - lay1", 260, -26., 26., 350, -3.5, 3.5); + hclusMap2 = fs->make("hclusMap2", "clus - lay2", 260, -26., 26., 350, -3.5, 3.5); + hclusMap3 = fs->make("hclusMap3", "clus - lay3", 260, -26., 26., 350, -3.5, 3.5); #endif - } // ------------ method called to at the end of the job ------------ -void TestPixTracks::endJob(){ +void TestPixTracks::endJob() { cout << " End PixelTracksTest " << endl; - if(countEvents>0.) { + if (countEvents > 0.) { countTracks /= countEvents; countGoodTracks /= countEvents; countTracksInPix /= countEvents; countPVs /= countEvents; countLumi /= 1000.; - cout<<" Average tracks/event "<< countTracks<<" good "<< countGoodTracks<<" in pix "<< countTracksInPix - <<" PVs "<< countPVs<<" events " << countEvents<<" lumi pb-1 "<< countLumi<<"/10, bug!"<Fill(float(bx)); hlumi0->Fill(float(lumiBlock)); - edm::LuminosityBlock const& iLumi = e.getLuminosityBlock(); + edm::LuminosityBlock const &iLumi = e.getLuminosityBlock(); edm::Handle lumi; iLumi.getByLabel("lumiProducer", lumi); edm::Handle cond; - float intlumi = 0, instlumi=0; - int beamint1=0, beamint2=0; + float intlumi = 0, instlumi = 0; + int beamint1 = 0, beamint2 = 0; iLumi.getByLabel("conditionsInEdm", cond); // This will only work when running on RECO until (if) they fix it in the FW // When running on RAW and reconstructing, the LumiSummary will not appear // in the event before reaching endLuminosityBlock(). Therefore, it is not // possible to get this info in the event if (lumi.isValid()) { - intlumi =(lumi->intgRecLumi())/1000.; // 10^30 -> 10^33/cm2/sec -> 1/nb/sec - instlumi=(lumi->avgInsDelLumi())/1000.; - beamint1=(cond->totalIntensityBeam1)/1000; - beamint2=(cond->totalIntensityBeam2)/1000; + intlumi = (lumi->intgRecLumi()) / 1000.; // 10^30 -> 10^33/cm2/sec -> 1/nb/sec + instlumi = (lumi->avgInsDelLumi()) / 1000.; + beamint1 = (cond->totalIntensityBeam1) / 1000; + beamint2 = (cond->totalIntensityBeam2) / 1000; } else { //std::cout << "** ERROR: Event does not get lumi info\n"; } - hinstl->Fill(float(lumiBlock),float(instlumi)); - hintgl->Fill(float(lumiBlock),float(intlumi)); - hbeam1->Fill(float(lumiBlock),float(beamint1)); - hbeam2->Fill(float(lumiBlock),float(beamint2)); - - - + hinstl->Fill(float(lumiBlock), float(instlumi)); + hintgl->Fill(float(lumiBlock), float(intlumi)); + hbeam1->Fill(float(lumiBlock), float(beamint1)); + hbeam2->Fill(float(lumiBlock), float(beamint2)); #ifdef L1 // Get L1 Handle L1GTRR; - e.getByLabel("gtDigis",L1GTRR); + e.getByLabel("gtDigis", L1GTRR); if (L1GTRR.isValid()) { //bool l1a = L1GTRR->decision(); // global decission? //cout<<" L1 status :"<decisionWord().size(); ++i) { - int l1flag = L1GTRR->decisionWord()[i]; - int t1flag = L1GTRR->technicalTriggerWord()[i]; - - if( l1flag>0 ) hl1a->Fill(float(i)); - if( t1flag>0 && i<64) hl1t->Fill(float(i)); - } // for loop - } // if l1a + int l1flag = L1GTRR->decisionWord()[i]; + int t1flag = L1GTRR->technicalTriggerWord()[i]; + + if (l1flag > 0) + hl1a->Fill(float(i)); + if (t1flag > 0 && i < 64) + hl1t->Fill(float(i)); + } // for loop + } // if l1a #endif #ifdef HLT bool hlt[256]; - for(int i=0;i<256;++i) hlt[i]=false; + for (int i = 0; i < 256; ++i) + hlt[i] = false; edm::TriggerNames TrigNames; edm::Handle HLTResults; // Extract the HLT results - e.getByLabel(edm::InputTag("TriggerResults","","HLT"),HLTResults); + e.getByLabel(edm::InputTag("TriggerResults", "", "HLT"), HLTResults); if ((HLTResults.isValid() == true) && (HLTResults->size() > 0)) { - //TrigNames.init(*HLTResults); - const edm::TriggerNames & TrigNames = e.triggerNames(*HLTResults); + const edm::TriggerNames &TrigNames = e.triggerNames(*HLTResults); //cout<wasrun(TrigNames.triggerIndex(TrigNames.triggerName(i))) == true) && - (HLTResults->accept(TrigNames.triggerIndex(TrigNames.triggerName(i))) == true) && - (HLTResults->error( TrigNames.triggerIndex(TrigNames.triggerName(i))) == false) ) { - - hlt[i]=true; + if ((HLTResults->wasrun(TrigNames.triggerIndex(TrigNames.triggerName(i))) == true) && + (HLTResults->accept(TrigNames.triggerIndex(TrigNames.triggerName(i))) == true) && + (HLTResults->error(TrigNames.triggerIndex(TrigNames.triggerName(i))) == false)) { + hlt[i] = true; hlt1->Fill(float(i)); - } // if hlt + } // if hlt - } // loop - } // if valid + } // loop + } // if valid #endif - // -- Does this belong into beginJob()? //ESHandle TG; //iSetup.get().get(TG); //const TrackerGeometry* theTrackerGeometry = TG.product(); //const TrackerGeometry& theTracker(*theTrackerGeometry); - // Get event setup + // Get event setup edm::ESHandle geom; - es.get().get( geom ); - const TrackerGeometry& theTracker(*geom); - + es.get().get(geom); + const TrackerGeometry &theTracker(*geom); // -- Primary vertices // ---------------------------------------------------------------------- edm::Handle vertices; e.getByLabel("offlinePrimaryVertices", vertices); - if(PRINT) cout<<" PV list "<size()<size() << endl; int pvNotFake = 0, pvsTrue = 0; vector pvzVector; for (reco::VertexCollection::const_iterator iv = vertices->begin(); iv != vertices->end(); ++iv) { - - if( (iv->isFake()) == 1 ) continue; - pvNotFake++; - float pvx = iv->x(); - float pvy = iv->y(); - float pvz = iv->z(); - int numTracksPerPV = iv->tracksSize(); - //int numTracksPerPV = iv->nTracks(); - - //float xe = iv->xError(); - //float ye = iv->yError(); - //float ze = iv->zError(); - //int chi2 = iv->chi2(); - //int dof = iv->ndof(); - - if(PRINT) cout<<" PV "<Fill(pvz); - if(pvz>-22. && pvz<22.) { - float pvr = sqrt(pvx*pvx + pvy*pvy); - hpvxy->Fill(pvx,pvy); - hpvr->Fill(pvr); - if(pvr<0.3) { - pvsTrue++; - pvzVector.push_back(pvz); - //if(PRINT) cout<<"PV "<isFake()) == 1) + continue; + pvNotFake++; + float pvx = iv->x(); + float pvy = iv->y(); + float pvz = iv->z(); + int numTracksPerPV = iv->tracksSize(); + //int numTracksPerPV = iv->nTracks(); + + //float xe = iv->xError(); + //float ye = iv->yError(); + //float ze = iv->zError(); + //int chi2 = iv->chi2(); + //int dof = iv->ndof(); + + if (PRINT) + cout << " PV " << pvNotFake << " pos = " << pvx << "/" << pvy << "/" << pvz << ", Num of tracks " + << numTracksPerPV << endl; + + hpvz->Fill(pvz); + if (pvz > -22. && pvz < 22.) { + float pvr = sqrt(pvx * pvx + pvy * pvy); + hpvxy->Fill(pvx, pvy); + hpvr->Fill(pvr); + if (pvr < 0.3) { + pvsTrue++; + pvzVector.push_back(pvz); + //if(PRINT) cout<<"PV "<Fill(float(pvNotFake)); hNumPvClean->Fill(float(pvsTrue)); - if(PRINT) cout<<" Not fake PVs = "< recTracks; // e.getByLabel("generalTracks", recTracks); // e.getByLabel("ctfWithMaterialTracksP5", recTracks); // e.getByLabel("splittedTracksP5", recTracks); //e.getByLabel("cosmictrackfinderP5", recTracks); - e.getByLabel(src_ , recTracks); - - - if(PRINT) cout<<" Tracks "<size()<begin(); - t!=recTracks->end(); ++t){ + e.getByLabel(src_, recTracks); + if (PRINT) + cout << " Tracks " << recTracks->size() << endl; + for (reco::TrackCollection::const_iterator t = recTracks->begin(); t != recTracks->end(); ++t) { trackNumber++; - numOfClustersPerDet1=0; - numOfClustersPerDet2=0; - numOfClustersPerDet3=0; - int pixelHits=0; - + numOfClustersPerDet1 = 0; + numOfClustersPerDet2 = 0; + numOfClustersPerDet3 = 0; + int pixelHits = 0; + int size = t->recHitsSize(); float pt = t->pt(); float eta = t->eta(); @@ -615,235 +577,240 @@ void TestPixTracks::analyze(const edm::Event& e, float tkvy = t->vy(); float tkvz = t->vz(); - if(PRINT) cout<<"Track "<Fill(eta); hDz->Fill(dz); - if(abs(eta)>2.8 || abs(dz)>25.) continue; // skip - + if (abs(eta) > 2.8 || abs(dz) > 25.) + continue; // skip + hD0->Fill(d0); - if(d0>1.0) continue; // skip - + if (d0 > 1.0) + continue; // skip + bool goodTrack = false; - for(vector::iterator m=pvzVector.begin(); m!=pvzVector.end();++m) { + for (vector::iterator m = pvzVector.begin(); m != pvzVector.end(); ++m) { float z = *m; - float tmp = abs(z-dz); + float tmp = abs(z - dz); hzdiff->Fill(tmp); - if( tmp < 1.) goodTrack=true; + if (tmp < 1.) + goodTrack = true; } - - if(!goodTrack) continue; - countNiceTracks++; + + if (!goodTrack) + continue; + countNiceTracks++; hPt->Fill(pt); - + // Loop over rechits - for ( trackingRecHit_iterator recHit = t->recHitsBegin(); - recHit != t->recHitsEnd(); ++recHit ) { - - if ( !((*recHit)->isValid()) ) continue; + for (trackingRecHit_iterator recHit = t->recHitsBegin(); recHit != t->recHitsEnd(); ++recHit) { + if (!((*recHit)->isValid())) + continue; - if( (*recHit)->geographicalId().det() != DetId::Tracker ) continue; + if ((*recHit)->geographicalId().det() != DetId::Tracker) + continue; - const DetId & hit_detId = (*recHit)->geographicalId(); + const DetId &hit_detId = (*recHit)->geographicalId(); uint IntSubDetID = (hit_detId.subdetId()); - // Select pixel rechits - if(IntSubDetID == 0 ) continue; // Select ?? - if(IntSubDetID != PixelSubdetector::PixelBarrel) continue; // look only at bpix || IntSubDetID == PixelSubdetector::PixelEndcap) { + // Select pixel rechits + if (IntSubDetID == 0) + continue; // Select ?? + if (IntSubDetID != PixelSubdetector::PixelBarrel) + continue; // look only at bpix || IntSubDetID == PixelSubdetector::PixelEndcap) { // Pixel detector PXBDetId pdetId = PXBDetId(hit_detId); //unsigned int detTypeP=pdetId.det(); //unsigned int subidP=pdetId.subdetId(); // Barell layer = 1,2,3 - int layer=pdetId.layer(); + int layer = pdetId.layer(); // Barrel ladder id 1-20,32,44. - int ladder=pdetId.ladder(); + int ladder = pdetId.ladder(); // Barrel Z-index=1,8 - int zindex=pdetId.module(); + int zindex = pdetId.module(); - if(PRINT) cout<<"barrel layer/ladder/module: "< (theTracker.idToDet(hit_detId) ); + const PixelGeomDetUnit *theGeomDet = dynamic_cast(theTracker.idToDet(hit_detId)); double detZ = theGeomDet->surface().position().z(); double detR = theGeomDet->surface().position().perp(); - const PixelTopology * topol = &(theGeomDet->specificTopology()); // pixel topology - - //std::vector output = getRecHitComponents((*recHit).get()); + const PixelTopology *topol = &(theGeomDet->specificTopology()); // pixel topology + + //std::vector output = getRecHitComponents((*recHit).get()); //std::vector TrkComparison::getRecHitComponents(const TrackingRecHit* rechit){ - const SiPixelRecHit* hit = dynamic_cast((*recHit).get()); + const SiPixelRecHit *hit = dynamic_cast((*recHit).get()); //edm::Ref ,SiStripCluster> cluster = hit->cluster(); // get the edm::Ref to the cluster - if(hit) { - - // RecHit (recthits are transient, so not available without ttrack refit) - //double xloc = hit->localPosition().x();// 1st meas coord - //double yloc = hit->localPosition().y();// 2nd meas coord or zero - //double zloc = hit->localPosition().z();// up, always zero - //cout<<" rechit loc "<, SiPixelCluster> const& clust = hit->cluster(); - // check if the ref is not null - if (!clust.isNonnull()) continue; - - numberOfClusters++; - pixelHits++; - float charge = (clust->charge())/1000.0; // convert electrons to kilo-electrons - int size = clust->size(); - int sizeX = clust->sizeX(); - int sizeY = clust->sizeY(); - float row = clust->x(); - float col = clust->y(); - numberOfPixels += size; - - //cout<<" clus loc "<surface().toGlobal( lp ); - double gX = clustgp.x(); - double gY = clustgp.y(); - double gZ = clustgp.z(); - - //cout<<" CLU GLOBAL "<maxPixelCol(); - //int maxPixelRow = clust->maxPixelRow(); - //int minPixelCol = clust->minPixelCol(); - //int minPixelRow = clust->minPixelRow(); - //int geoId = PixGeom->geographicalId().rawId(); - // Replace with the topology methods - // edge method moved to topologi class - //int edgeHitX = (int) ( topol->isItEdgePixelInX( minPixelRow ) || topol->isItEdgePixelInX( maxPixelRow ) ); - //int edgeHitY = (int) ( topol->isItEdgePixelInY( minPixelCol ) || topol->isItEdgePixelInY( maxPixelCol ) ); - - // calculate alpha and beta from cluster position - //LocalTrajectoryParameters ltp = tsos.localParameters(); - //LocalVector localDir = ltp.momentum()/ltp.momentum().mag(); - //float locx = localDir.x(); - //float locy = localDir.y(); - //float locz = localDir.z(); - //float loctheta = localDir.theta(); // currently unused - //float alpha = atan2( locz, locx ); - //float beta = atan2( locz, locy ); - - if(layer==1) { - - hDetMap1->Fill(float(zindex),float(ladder)); - hcluDetMap1->Fill(col,row); - hcharge1->Fill(charge); - hcols1->Fill(col); - hrows1->Fill(row); - - hclusMap1->Fill(gZ,phi); - - if(pt>CLU_SIZE_PT_CUT) { - hsize1->Fill(float(size)); - hsizex1->Fill(float(sizeX)); - hsizey1->Fill(float(sizeY)); - - hclumult1->Fill(eta,float(size)); - hclumultx1->Fill(eta,float(sizeX)); - hclumulty1->Fill(eta,float(sizeY)); - hcluchar1->Fill(eta,float(charge)); - } - - numOfClustersPerDet1++; - numOfClustersPerLay1++; - numOfPixelsPerLay1 += size; - - } else if(layer==2) { - - hDetMap2->Fill(float(zindex),float(ladder)); - hcluDetMap2->Fill(col,row); - hcharge2->Fill(charge); - hcols2->Fill(col); - hrows2->Fill(row); - - hclusMap2->Fill(gZ,phi); - - if(pt>CLU_SIZE_PT_CUT) { - hsize2->Fill(float(size)); - hsizex2->Fill(float(sizeX)); - hsizey2->Fill(float(sizeY)); - - hclumult2->Fill(eta,float(size)); - hclumultx2->Fill(eta,float(sizeX)); - hclumulty2->Fill(eta,float(sizeY)); - hcluchar2->Fill(eta,float(charge)); - } - - numOfClustersPerDet2++; - numOfClustersPerLay2++; - numOfPixelsPerLay2 += size; - - } else if(layer==3) { - - hDetMap3->Fill(float(zindex),float(ladder)); - hcluDetMap3->Fill(col,row); - hcharge3->Fill(charge); - hcols3->Fill(col); - hrows3->Fill(row); - - hclusMap3->Fill(gZ,phi); - - if(pt>CLU_SIZE_PT_CUT) { - hsize3->Fill(float(size)); - hsizex3->Fill(float(sizeX)); - hsizey3->Fill(float(sizeY)); - hclumult3->Fill(eta,float(size)); - hclumultx3->Fill(eta,float(sizeX)); - hclumulty3->Fill(eta,float(sizeY)); - hcluchar3->Fill(eta,float(charge)); - } - - numOfClustersPerDet3++; - numOfClustersPerLay3++; - numOfPixelsPerLay3 += size; - } // if layer - - } // if valid - - } // clusters - - if(pixelHits>0) countPixTracks++; - - if(PRINT) cout<<" Clusters for track "<localPosition().x();// 1st meas coord + //double yloc = hit->localPosition().y();// 2nd meas coord or zero + //double zloc = hit->localPosition().z();// up, always zero + //cout<<" rechit loc "<, SiPixelCluster> const &clust = hit->cluster(); + // check if the ref is not null + if (!clust.isNonnull()) + continue; + + numberOfClusters++; + pixelHits++; + float charge = (clust->charge()) / 1000.0; // convert electrons to kilo-electrons + int size = clust->size(); + int sizeX = clust->sizeX(); + int sizeY = clust->sizeY(); + float row = clust->x(); + float col = clust->y(); + numberOfPixels += size; + + //cout<<" clus loc "<surface().toGlobal(lp); + double gX = clustgp.x(); + double gY = clustgp.y(); + double gZ = clustgp.z(); + + //cout<<" CLU GLOBAL "<maxPixelCol(); + //int maxPixelRow = clust->maxPixelRow(); + //int minPixelCol = clust->minPixelCol(); + //int minPixelRow = clust->minPixelRow(); + //int geoId = PixGeom->geographicalId().rawId(); + // Replace with the topology methods + // edge method moved to topologi class + //int edgeHitX = (int) ( topol->isItEdgePixelInX( minPixelRow ) || topol->isItEdgePixelInX( maxPixelRow ) ); + //int edgeHitY = (int) ( topol->isItEdgePixelInY( minPixelCol ) || topol->isItEdgePixelInY( maxPixelCol ) ); + + // calculate alpha and beta from cluster position + //LocalTrajectoryParameters ltp = tsos.localParameters(); + //LocalVector localDir = ltp.momentum()/ltp.momentum().mag(); + //float locx = localDir.x(); + //float locy = localDir.y(); + //float locz = localDir.z(); + //float loctheta = localDir.theta(); // currently unused + //float alpha = atan2( locz, locx ); + //float beta = atan2( locz, locy ); + + if (layer == 1) { + hDetMap1->Fill(float(zindex), float(ladder)); + hcluDetMap1->Fill(col, row); + hcharge1->Fill(charge); + hcols1->Fill(col); + hrows1->Fill(row); + + hclusMap1->Fill(gZ, phi); + + if (pt > CLU_SIZE_PT_CUT) { + hsize1->Fill(float(size)); + hsizex1->Fill(float(sizeX)); + hsizey1->Fill(float(sizeY)); + + hclumult1->Fill(eta, float(size)); + hclumultx1->Fill(eta, float(sizeX)); + hclumulty1->Fill(eta, float(sizeY)); + hcluchar1->Fill(eta, float(charge)); + } + + numOfClustersPerDet1++; + numOfClustersPerLay1++; + numOfPixelsPerLay1 += size; + + } else if (layer == 2) { + hDetMap2->Fill(float(zindex), float(ladder)); + hcluDetMap2->Fill(col, row); + hcharge2->Fill(charge); + hcols2->Fill(col); + hrows2->Fill(row); + + hclusMap2->Fill(gZ, phi); + + if (pt > CLU_SIZE_PT_CUT) { + hsize2->Fill(float(size)); + hsizex2->Fill(float(sizeX)); + hsizey2->Fill(float(sizeY)); + + hclumult2->Fill(eta, float(size)); + hclumultx2->Fill(eta, float(sizeX)); + hclumulty2->Fill(eta, float(sizeY)); + hcluchar2->Fill(eta, float(charge)); + } + + numOfClustersPerDet2++; + numOfClustersPerLay2++; + numOfPixelsPerLay2 += size; + + } else if (layer == 3) { + hDetMap3->Fill(float(zindex), float(ladder)); + hcluDetMap3->Fill(col, row); + hcharge3->Fill(charge); + hcols3->Fill(col); + hrows3->Fill(row); + + hclusMap3->Fill(gZ, phi); + + if (pt > CLU_SIZE_PT_CUT) { + hsize3->Fill(float(size)); + hsizex3->Fill(float(sizeX)); + hsizey3->Fill(float(sizeY)); + hclumult3->Fill(eta, float(size)); + hclumultx3->Fill(eta, float(sizeX)); + hclumulty3->Fill(eta, float(sizeY)); + hcluchar3->Fill(eta, float(charge)); + } + + numOfClustersPerDet3++; + numOfClustersPerLay3++; + numOfPixelsPerLay3 += size; + } // if layer + + } // if valid + + } // clusters + + if (pixelHits > 0) + countPixTracks++; + + if (PRINT) + cout << " Clusters for track " << trackNumber << " num of clusters " << numberOfClusters << " num of pixels " + << pixelHits << endl; #ifdef HISTOS - if(numberOfClusters>0) { + if (numberOfClusters > 0) { hclusPerTrk1->Fill(float(numOfClustersPerDet1)); - if(PRINT) cout<<"Lay1: number of clusters per track = "< trajTrackCollectionHandle; - e.getByLabel(conf_.getParameter("trajectoryInput"),trajTrackCollectionHandle); + e.getByLabel(conf_.getParameter("trajectoryInput"), trajTrackCollectionHandle); TrajectoryStateCombiner tsoscomb; - - int NbrTracks = trajTrackCollectionHandle->size(); - std::cout << " track measurements " << trajTrackCollectionHandle->size() << std::endl; + + int NbrTracks = trajTrackCollectionHandle->size(); + std::cout << " track measurements " << trajTrackCollectionHandle->size() << std::endl; int trackNumber = 0; int numberOfClusters = 0; - for(TrajTrackAssociationCollection::const_iterator it = trajTrackCollectionHandle->begin(), itEnd = trajTrackCollectionHandle->end(); it!=itEnd;++it){ - + for (TrajTrackAssociationCollection::const_iterator it = trajTrackCollectionHandle->begin(), + itEnd = trajTrackCollectionHandle->end(); + it != itEnd; + ++it) { int pixelHits = 0; int stripHits = 0; - const Track& track = *it->val; - const Trajectory& traj = *it->key; - - std::vector checkColl = traj.measurements(); - for(std::vector::const_iterator checkTraj = checkColl.begin(); - checkTraj != checkColl.end(); ++checkTraj) { + const Track &track = *it->val; + const Trajectory &traj = *it->key; - if(! checkTraj->updatedState().isValid()) continue; + std::vector checkColl = traj.measurements(); + for (std::vector::const_iterator checkTraj = checkColl.begin(); checkTraj != checkColl.end(); + ++checkTraj) { + if (!checkTraj->updatedState().isValid()) + continue; TransientTrackingRecHit::ConstRecHitPointer testhit = checkTraj->recHit(); - if(! testhit->isValid() || testhit->geographicalId().det() != DetId::Tracker ) continue; + if (!testhit->isValid() || testhit->geographicalId().det() != DetId::Tracker) + continue; uint testSubDetID = (testhit->geographicalId().subdetId()); - if(testSubDetID == PixelSubdetector::PixelBarrel || testSubDetID == PixelSubdetector::PixelEndcap) pixelHits++; + if (testSubDetID == PixelSubdetector::PixelBarrel || testSubDetID == PixelSubdetector::PixelEndcap) + pixelHits++; else if (testSubDetID == StripSubdetector::TIB || testSubDetID == StripSubdetector::TOB || - testSubDetID == StripSubdetector::TID || testSubDetID == StripSubdetector::TEC) stripHits++; - + testSubDetID == StripSubdetector::TID || testSubDetID == StripSubdetector::TEC) + stripHits++; } - - if (pixelHits == 0) continue; + if (pixelHits == 0) + continue; trackNumber++; - std::cout << " track " << trackNumber <<" has pixelhits "< tmColl = traj.measurements(); - for(std::vector::const_iterator itTraj = checkColl.begin(); - itTraj != checkColl.end(); ++itTraj) { - if(! itTraj->updatedState().isValid()) continue; + for (std::vector::const_iterator itTraj = checkColl.begin(); itTraj != checkColl.end(); + ++itTraj) { + if (!itTraj->updatedState().isValid()) + continue; - TrajectoryStateOnSurface tsos = tsoscomb( itTraj->forwardPredictedState(), itTraj->backwardPredictedState() ); + TrajectoryStateOnSurface tsos = tsoscomb(itTraj->forwardPredictedState(), itTraj->backwardPredictedState()); TransientTrackingRecHit::ConstRecHitPointer hit = itTraj->recHit(); - if(! hit->isValid() || hit->geographicalId().det() != DetId::Tracker ) continue; + if (!hit->isValid() || hit->geographicalId().det() != DetId::Tracker) + continue; - const DetId & hit_detId = hit->geographicalId(); + const DetId &hit_detId = hit->geographicalId(); uint IntSubDetID = (hit_detId.subdetId()); - - if(IntSubDetID == 0 ) continue; // Select ?? - if(IntSubDetID != PixelSubdetector::PixelBarrel) continue; // look only at bpix || IntSubDetID == PixelSubdetector::PixelEndcap) { + if (IntSubDetID == 0) + continue; // Select ?? + if (IntSubDetID != PixelSubdetector::PixelBarrel) + continue; // look only at bpix || IntSubDetID == PixelSubdetector::PixelEndcap) { -// const GeomDetUnit* detUnit = hit->detUnit(); -// if(detUnit) { -// const Surface& surface = hit->detUnit()->surface(); -// const TrackerGeometry& theTracker(*tkGeom_); -// const PixelGeomDetUnit* theGeomDet = dynamic_cast (theTracker.idToDet(hit_detId) ); -// const RectangularPixelTopology * topol = dynamic_cast(&(theGeomDet->specificTopology())); -// } - + // const GeomDetUnit* detUnit = hit->detUnit(); + // if(detUnit) { + // const Surface& surface = hit->detUnit()->surface(); + // const TrackerGeometry& theTracker(*tkGeom_); + // const PixelGeomDetUnit* theGeomDet = dynamic_cast (theTracker.idToDet(hit_detId) ); + // const RectangularPixelTopology * topol = dynamic_cast(&(theGeomDet->specificTopology())); + // } // get the enclosed persistent hit const TrackingRecHit *persistentHit = hit->hit(); // check if it's not null, and if it's a valid pixel hit if ((persistentHit != 0) && (typeid(*persistentHit) == typeid(SiPixelRecHit))) { - // tell the C++ compiler that the hit is a pixel hit - const SiPixelRecHit* pixhit = dynamic_cast( hit->hit() ); - // get the edm::Ref to the cluster - edm::Ref, SiPixelCluster> const& clust = (*pixhit).cluster(); - // check if the ref is not null - if (clust.isNonnull()) { - - numberOfClusters++; - pixelHits++; - float charge = (clust->charge())/1000.0; // convert electrons to kilo-electrons - int size = clust->size(); - int size_x = clust->sizeX(); - int size_y = clust->sizeY(); - float row = clust->x(); - float col = clust->y(); - - //LocalPoint lp = topol->localPosition(MeasurementPoint(clust_.row,clust_.col)); - //float x = lp.x(); - //float y = lp.y(); - - int maxPixelCol = clust->maxPixelCol(); - int maxPixelRow = clust->maxPixelRow(); - int minPixelCol = clust->minPixelCol(); - int minPixelRow = clust->minPixelRow(); - - //int geoId = PixGeom->geographicalId().rawId(); - - // Replace with the topology methods - // edge method moved to topologi class - //int edgeHitX = (int) ( topol->isItEdgePixelInX( minPixelRow ) || topol->isItEdgePixelInX( maxPixelRow ) ); - //int edgeHitY = (int) ( topol->isItEdgePixelInY( minPixelCol ) || topol->isItEdgePixelInY( maxPixelCol ) ); - - // calculate alpha and beta from cluster position - //LocalTrajectoryParameters ltp = tsos.localParameters(); - //LocalVector localDir = ltp.momentum()/ltp.momentum().mag(); - - //float locx = localDir.x(); - //float locy = localDir.y(); - //float locz = localDir.z(); - //float loctheta = localDir.theta(); // currently unused - - //float alpha = atan2( locz, locx ); - //float beta = atan2( locz, locy ); - - //clust_.normalized_charge = clust_.charge*sqrt(1.0/(1.0/pow(tan(clust_.clust_alpha),2)+1.0/pow(tan(clust_.clust_beta),2)+1.0)); - } // valid cluster - } // valid peristant hit - - } // loop over trajectory meas. - - if(PRINT) cout<<" Cluster for track "<(hit->hit()); + // get the edm::Ref to the cluster + edm::Ref, SiPixelCluster> const &clust = (*pixhit).cluster(); + // check if the ref is not null + if (clust.isNonnull()) { + numberOfClusters++; + pixelHits++; + float charge = (clust->charge()) / 1000.0; // convert electrons to kilo-electrons + int size = clust->size(); + int size_x = clust->sizeX(); + int size_y = clust->sizeY(); + float row = clust->x(); + float col = clust->y(); + + //LocalPoint lp = topol->localPosition(MeasurementPoint(clust_.row,clust_.col)); + //float x = lp.x(); + //float y = lp.y(); + + int maxPixelCol = clust->maxPixelCol(); + int maxPixelRow = clust->maxPixelRow(); + int minPixelCol = clust->minPixelCol(); + int minPixelRow = clust->minPixelRow(); + + //int geoId = PixGeom->geographicalId().rawId(); + + // Replace with the topology methods + // edge method moved to topologi class + //int edgeHitX = (int) ( topol->isItEdgePixelInX( minPixelRow ) || topol->isItEdgePixelInX( maxPixelRow ) ); + //int edgeHitY = (int) ( topol->isItEdgePixelInY( minPixelCol ) || topol->isItEdgePixelInY( maxPixelCol ) ); + + // calculate alpha and beta from cluster position + //LocalTrajectoryParameters ltp = tsos.localParameters(); + //LocalVector localDir = ltp.momentum()/ltp.momentum().mag(); + + //float locx = localDir.x(); + //float locy = localDir.y(); + //float locz = localDir.z(); + //float loctheta = localDir.theta(); // currently unused + + //float alpha = atan2( locz, locx ); + //float beta = atan2( locz, locy ); + + //clust_.normalized_charge = clust_.charge*sqrt(1.0/(1.0/pow(tan(clust_.clust_alpha),2)+1.0/pow(tan(clust_.clust_beta),2)+1.0)); + } // valid cluster + } // valid peristant hit + + } // loop over trajectory meas. + + if (PRINT) + cout << " Cluster for track " << trackNumber << " cluaters " << numberOfClusters << " " << pixelHits << endl; + + } // loop over tracks + +#endif // USE_TRAJ + + cout << " event with tracks = " << trackNumber << " " << countGoodTracks << endl; +} // end //define this as a plug-in DEFINE_FWK_MODULE(TestPixTracks); diff --git a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc index 82cb042cd25be..a3c8ed0155288 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc +++ b/RecoLocalTracker/SiPixelClusterizer/test/TestWithTracks.cc @@ -36,8 +36,8 @@ #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h index 9b9ca3c0d5b49..3b8a49e88a096 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h @@ -21,7 +21,7 @@ #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/Topology.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h index bdb24cfe51832..5618ac4603763 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h @@ -5,7 +5,7 @@ // Already in the base class //#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -//#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" //#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementPoint.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementError.h" diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h index d284f26f6e7cb..35477fcf68e37 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h @@ -5,7 +5,7 @@ // Already in the base class //#include "Geometry/CommonDetUnit/interface/GeomDetType.h" -//#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +//#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" //#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementPoint.h" //#include "Geometry/CommonDetAlgo/interface/MeasurementError.h" diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc index bc5abc6150e49..1fd756745e24a 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitConverter.cc @@ -13,7 +13,7 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/SiPixelRecHitConverter.h" // Geometry #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" // Data Formats #include "DataFormats/DetId/interface/DetId.h" diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc index 8d2c542c71aed..90f29daa31e95 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEBase.cc @@ -5,9 +5,9 @@ // change to use Lorentz angle from DB Lotte Wilke, Jan. 31st, 2008 // Change to use Generic error & Template calibration from DB - D.Fehling 11/08 -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/ProxyPixelTopology.h" +#include "Geometry/CommonTopologies/interface/ProxyPixelTopology.h" #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h" diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc index 014ff1f9d64c3..e33e5afa01deb 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEClusterRepair.cc @@ -2,7 +2,7 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEClusterRepair.h" // Geometry services -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" // MessageLogger diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc index b14dfb14df158..2ac97e7a5d51a 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc @@ -1,6 +1,6 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGeneric.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" // this is needed to get errors from templates diff --git a/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc b/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc index 2233ee0f1b843..d6fe3bb4b95d9 100644 --- a/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc +++ b/RecoLocalTracker/SiPixelRecHits/src/PixelCPETemplateReco.cc @@ -2,7 +2,7 @@ #include "RecoLocalTracker/SiPixelRecHits/interface/PixelCPETemplateReco.h" // Geometry services -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" //#define DEBUG diff --git a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc index 363c5a6138038..03250831c352d 100644 --- a/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc +++ b/RecoLocalTracker/SiPixelRecHits/test/ReadPixelRecHit.cc @@ -20,8 +20,8 @@ #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" diff --git a/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h b/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h index 90bc8a50ea942..09b8921740fd7 100644 --- a/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h +++ b/RecoLocalTracker/SubCollectionProducers/interface/PixelClusterSelectorTopBottom.h @@ -20,7 +20,7 @@ #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "DataFormats/DetId/interface/DetId.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h b/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h index 9d99b6fb022d9..9f609e51ba3c0 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h +++ b/RecoLuminosity/LumiProducer/test/analysis/plugins/PCCNTupler.h @@ -20,7 +20,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h" diff --git a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h index 5a956771c2944..4215866a4a7b0 100644 --- a/RecoMET/METProducers/interface/GlobalHaloDataProducer.h +++ b/RecoMET/METProducers/interface/GlobalHaloDataProducer.h @@ -154,8 +154,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc b/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc index 2e2c177d91931..3c236c6506bff 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/bin/PixelClusterShapeExtractor.cc @@ -20,7 +20,7 @@ #include "RecoTracker/Record/interface/CkfComponentsRecord.h" #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeHitFilter.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" # diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc index 96020193353bf..22dced0f36975 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/plugins/PixelVertexProducerClusters.cc @@ -9,7 +9,7 @@ #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc b/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc index 0c762ac61c64a..373636d129ab5 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/plugins/SiPixelClusterShapeCacheProducer.cc @@ -13,7 +13,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShape.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShape.cc index d8e92b4c077bc..4f760837bfb1c 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShape.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShape.cc @@ -1,7 +1,7 @@ #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShape.h" #include "RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterData.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" diff --git a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc index efcc633869e68..97394ab390c48 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc +++ b/RecoPixelVertexing/PixelLowPtUtilities/src/ClusterShapeHitFilter.cc @@ -10,7 +10,7 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/RecoTracker/DeDx/interface/DeDxTools.h b/RecoTracker/DeDx/interface/DeDxTools.h index 1efdaade543a5..e7ea7b3d621f1 100644 --- a/RecoTracker/DeDx/interface/DeDxTools.h +++ b/RecoTracker/DeDx/interface/DeDxTools.h @@ -25,7 +25,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GeomDetType.h" diff --git a/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h b/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h index a695e048f93bf..7ffc324dad515 100644 --- a/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h +++ b/RecoTracker/DeDx/plugins/DeDxEstimatorProducer.h @@ -13,7 +13,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" #include "DataFormats/Common/interface/ValueMap.h" diff --git a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h index d9fdff2c5a4bf..d65c523750882 100644 --- a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h +++ b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h @@ -13,7 +13,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/TrackReco/interface/DeDxData.h" diff --git a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc index b9032faa59959..bd7c54e22fa4f 100644 --- a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc +++ b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc @@ -6,7 +6,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" +#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h index 413378a7be2c3..84ef14119047a 100644 --- a/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkPhase2OTMeasurementDet.h @@ -3,7 +3,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "RecoLocalTracker/Phase2TrackerRecHits/interface/Phase2StripCPE.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h index d28e3fcece7a5..ee58eb267b9c2 100644 --- a/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkPixelMeasurementDet.h @@ -4,7 +4,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" //#include "DataFormats/SiPixelCluster/interface/SiPixelClusterFwd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" diff --git a/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h b/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h index 7daaf80f58fe2..308739bb9ec02 100644 --- a/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h +++ b/RecoTracker/MeasurementDet/plugins/TkStackMeasurementDet.h @@ -4,7 +4,7 @@ #include "TrackingTools/MeasurementDet/interface/MeasurementDet.h" #include "TkPhase2OTMeasurementDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/StackGeomDet.h" +#include "Geometry/CommonDetUnit/interface/StackGeomDet.h" #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h" #include "FWCore/Utilities/interface/Visibility.h" diff --git a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h index 7703a00d04fd3..0c1d6d9313ebe 100644 --- a/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h +++ b/RecoTracker/SpecialSeedGenerators/interface/CosmicRegionalSeedGenerator.h @@ -36,7 +36,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc index 606addc15cc06..0ffb6fba9d52a 100644 --- a/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc +++ b/RecoTracker/TransientTrackingRecHit/src/TkClonerImpl.cc @@ -18,7 +18,7 @@ #include "RecoLocalTracker/ClusterParameterEstimator/interface/StripClusterParameterEstimator.h" #include "RecoLocalTracker/SiStripRecHitConverter/interface/SiStripRecHitMatcher.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include #include diff --git a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc index 6ce81ef1dced2..fc9ac3b4ceddf 100644 --- a/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc +++ b/SLHCUpgradeSimulations/Geometry/test/ModuleInfo_Phase2.cc @@ -32,13 +32,13 @@ #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" //#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/CommonTopologies/interface/Topology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/GeometrySurface/interface/BoundSurface.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc b/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc index 4e393ab4ed0ec..61cb4018b7218 100644 --- a/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc +++ b/SLHCUpgradeSimulations/Geometry/test/Phase2PixelNtuple.cc @@ -38,8 +38,8 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/PixelTopologyBuilder.h" diff --git a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h index 45989ccaff5d2..044ebc9d88954 100644 --- a/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h +++ b/SLHCUpgradeSimulations/Geometry/test/StdHitNtuplizer.h @@ -21,8 +21,8 @@ #include "DataFormats/TrackReco/interface/Track.h" //#include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" diff --git a/SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.h b/SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.h index 33393cffab1cb..3da1232bac5b8 100644 --- a/SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.h +++ b/SUSYBSMAnalysis/HSCP/plugins/HSCPDeDxInfoProducer.h @@ -13,7 +13,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/TrackReco/interface/DeDxData.h" diff --git a/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc b/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc index 42b6ed06d8abe..2f56bac53c9fb 100644 --- a/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc +++ b/SUSYBSMAnalysis/HSCP/plugins/HSCPTreeBuilder.cc @@ -41,7 +41,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h" diff --git a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc index 9005d6ae67d87..e8ebbc0eb12fa 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc @@ -19,7 +19,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" using namespace edm; diff --git a/SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc index 67cdd2f0e2219..8e2479085f824 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc @@ -20,7 +20,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" using namespace edm; diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc index 1c0ab394c2565..7b9f8db2ace2d 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc @@ -49,10 +49,10 @@ #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EDAnalyzer.h" diff --git a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc index c79a45f4da42d..b60151fecb736 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc @@ -49,7 +49,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "CondFormats/SiPixelObjects/interface/PixelROC.h" diff --git a/SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc index e270fd3644572..25eafb153a59c 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc @@ -39,7 +39,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" diff --git a/SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc b/SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc index 1a1f359b83a3f..a77ce89cdbee4 100644 --- a/SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc +++ b/SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc @@ -20,7 +20,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/IdealGeometryRecord.h" using namespace edm; diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc index c70fc252621eb..2a4309d07d422 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc @@ -27,8 +27,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" #include "DataFormats/SiPixelDigi/interface/PixelDigi.h" diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc index f365cd5e84458..ec109325ef2c6 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerValidateDigi.cc @@ -26,8 +26,8 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h" diff --git a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc index 49d21616e2284..874b7b897a434 100644 --- a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc +++ b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc @@ -40,8 +40,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc b/SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc index 98732d6d04003..5b2703f50af8b 100644 --- a/SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc +++ b/SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc @@ -21,10 +21,10 @@ #include "Geometry/CommonDetUnit/interface/GeomDetType.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" #include "CondFormats/SiPixelObjects/interface/PixelIndices.h" diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc index 8b83acecfa577..52110d1ebd09c 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc @@ -43,11 +43,11 @@ #include "DataFormats/GeometryVector/interface/LocalVector.h" #include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" // user include files diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc index 1aebd88f8dba6..bd0fdc42f7a85 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc @@ -105,7 +105,7 @@ // Geometry #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "CondFormats/SiPixelObjects/interface/PixelROC.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc index f80fa8b8b6603..88a373cde965d 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelDigisTest.cc @@ -41,8 +41,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" diff --git a/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc b/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc index 0608b2664e69c..4d5fb7ed4c4d7 100644 --- a/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc +++ b/SimTracker/SiPixelDigitizer/test/PixelMixedSimHitsTest.cc @@ -2,7 +2,7 @@ // // Package: PixelMixedSimHitsTest // Class: PixelMixedSimHitsTest -// +// /**\class PixelMixedSimHitsTest PixelMixedSimHitsTest.cc Description: Test Barrel pixel simhits and fills root histograms. @@ -36,9 +36,9 @@ //#include "Geometry/CommonDetUnit/interface/GeomDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" // +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" // #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h" @@ -64,13 +64,12 @@ using namespace edm; //#define CHECK_GEOM class PixelMixedSimHitsTest : public edm::EDAnalyzer { - public: - explicit PixelMixedSimHitsTest(const edm::ParameterSet&); + explicit PixelMixedSimHitsTest(const edm::ParameterSet &); ~PixelMixedSimHitsTest(); virtual void beginJob(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endJob(); + virtual void analyze(const edm::Event &, const edm::EventSetup &); + virtual void endJob(); private: // ----------member data --------------------------- @@ -80,26 +79,25 @@ class PixelMixedSimHitsTest : public edm::EDAnalyzer { typedef std::vector vstring; vstring trackerContainers; // Histograms - TFile* hFile; - TH1F *hBunchCrossing, *htof1m, *htof0, *htof1p, *htof2p; - TH1F *heloss1,*heloss2, *heloss3,*hdetunit,*hpabs,*hpid,*htof,*htid; - TH1F* hpixid,*hpixsubid,*hlayerid,*hladder1id,*hladder2id,*hladder3id, - *hz1id,*hz2id,*hz3id; + TFile *hFile; + TH1F *hBunchCrossing, *htof1m, *htof0, *htof1p, *htof2p; + TH1F *heloss1, *heloss2, *heloss3, *hdetunit, *hpabs, *hpid, *htof, *htid; + TH1F *hpixid, *hpixsubid, *hlayerid, *hladder1id, *hladder2id, *hladder3id, *hz1id, *hz2id, *hz3id; TH1F *hladder1idUp, *hladder2idUp, *hladder3idUp; - TH1F* hthick1,*hthick2,*hthick3,*hlength1,*hlength2,*hlength3; - TH1F *hwidth1,*hwidth2,*hwidth3; - TH1F *hwidth1h,*hwidth2h,*hwidth3h; - TH1F *hsimHitsPerDet1,*hsimHitsPerDet2,*hsimHitsPerDet3; - TH1F *hsimHitsPerLay1,*hsimHitsPerLay2,*hsimHitsPerLay3; - TH1F *hdetsPerLay1,*hdetsPerLay2,*hdetsPerLay3; + TH1F *hthick1, *hthick2, *hthick3, *hlength1, *hlength2, *hlength3; + TH1F *hwidth1, *hwidth2, *hwidth3; + TH1F *hwidth1h, *hwidth2h, *hwidth3h; + TH1F *hsimHitsPerDet1, *hsimHitsPerDet2, *hsimHitsPerDet3; + TH1F *hsimHitsPerLay1, *hsimHitsPerLay2, *hsimHitsPerLay3; + TH1F *hdetsPerLay1, *hdetsPerLay2, *hdetsPerLay3; TH1F *heloss1e, *heloss2e, *heloss3e; TH1F *heloss1mu, *heloss2mu, *heloss3mu; TH1F *htheta1, *htheta2, *htheta3; TH1F *hphi1, *hphi1h, *hphi2, *hphi3; TH1F *hdetr, *hdetz, *hdetphi1, *hdetphi2, *hdetphi3; - TH1F *hglobr1,*hglobr2,*hglobr3,*hglobz1, *hglobz2, *hglobz3; + TH1F *hglobr1, *hglobr2, *hglobr3, *hglobz1, *hglobz2, *hglobz3; TH1F *hglobr1h; - TH1F *hcolsB, *hrowsB, *hcolsF, *hrowsF; + TH1F *hcolsB, *hrowsB, *hcolsF, *hrowsF; TH1F *hglox1; // TH2F *htest, *htest2, *htest3, *htest4, *htest5; @@ -111,490 +109,481 @@ class PixelMixedSimHitsTest : public edm::EDAnalyzer { float modulePositionR[3][44][8]; float modulePositionPhi[3][44][8]; #endif - }; // -PixelMixedSimHitsTest::PixelMixedSimHitsTest(const edm::ParameterSet& iConfig): - conf_(iConfig) { +PixelMixedSimHitsTest::PixelMixedSimHitsTest(const edm::ParameterSet &iConfig) : conf_(iConfig) { trackerContainers.clear(); trackerContainers = iConfig.getParameter >("ROUList"); - cout<<" Construct PixelSimHitsTest "<("OutputFile"); - hFile = new TFile ( outputFile.c_str(), "RECREATE" ); - - const float max_charge = 200.; // in ke - hBunchCrossing = new TH1F( "hBunchCrossing", "Bunch Crossing", 10, -5., 5.); - heloss1 = new TH1F( "heloss1", "Eloss l1", 100, 0., max_charge); - heloss2 = new TH1F( "heloss2", "Eloss l2", 100, 0., max_charge); - heloss3 = new TH1F( "heloss3", "Eloss l3", 100, 0., max_charge); - - hdetunit = new TH1F( "hdetunit", "Det unit", 1000, - 302000000.,302300000.); - hpabs = new TH1F( "hpabs", "Pabs", 100, 0., 100.); - htof = new TH1F( "htof", "TOF", 50, -25., 25.); - htof1m = new TH1F( "htof1m", "TOF BC=-1", 250, -50., 75.); - htof0 = new TH1F( "htof0", "TOF BC=0", 250, -50., 75.); - htof1p = new TH1F( "htof1p", "TOF BC=+1", 250, -50., 75.); - htof2p = new TH1F( "htof2p", "TOF BC=+2", 250, -50., 75.); - - hpid = new TH1F( "hpid", "PID", 1000, 0., 1000.); - htid = new TH1F( "htid", "Track id", 100, 0., 100.); - - hpixid = new TH1F( "hpixid", "Pix det id", 10, 0., 10.); - hpixsubid = new TH1F( "hpixsubid", "Pix Barrel id", 10, 0., 10.); - hlayerid = new TH1F( "hlayerid", "Pix layer id", 10, 0., 10.); - hladder1id = new TH1F( "hladder1id", "Ladder L1 id", 100, -0.5, 49.5); - hladder2id = new TH1F( "hladder2id", "Ladder L2 id", 100, -0.5, 49.5); - hladder3id = new TH1F( "hladder3id", "Ladder L3 id", 100, -0.5, 49.5); - hz1id = new TH1F( "hz1id", "Z-index id L1", 10, 0., 10.); - hz2id = new TH1F( "hz2id", "Z-index id L2", 10, 0., 10.); - hz3id = new TH1F( "hz3id", "Z-index id L3", 10, 0., 10.); - - hthick1 = new TH1F( "hthick1", "Det 1 Thinckess", 400, 0.,0.04); - hthick2 = new TH1F( "hthick2", "Det 2 Thinckess", 400, 0.,0.04); - hthick3 = new TH1F( "hthick3", "Det 3 Thinckess", 400, 0.,0.04); - - hlength1 = new TH1F( "hlength1", "Det 1 Length", 700,-3.5,3.5); - hlength2 = new TH1F( "hlength2", "Det 2 Length", 700,-3.5,3.5); - hlength3 = new TH1F( "hlength3", "Det 3 Length", 700,-3.5,3.5); - - hwidth1 = new TH1F( "hwidth1", "Det 1 Width", 200,-1.,1.); - hwidth2 = new TH1F( "hwidth2", "Det 2 Width", 200,-1.,1.); - hwidth3 = new TH1F( "hwidth3", "Det 3 Width", 200,-1.,1.); - - hwidth1h = new TH1F( "hwidth1h", "Det 1 Width half-m", 200,-1.,1.); - hwidth2h = new TH1F( "hwidth2h", "Det 2 Width half-m", 200,-1.,1.); - hwidth3h = new TH1F( "hwidth3h", "Det 3 Width half-m", 200,-1.,1.); - - hsimHitsPerDet1 = new TH1F( "hsimHitsPerDet1", "SimHits per det l1", - 200, -0.5, 199.5); - hsimHitsPerDet2 = new TH1F( "hsimHitsPerDet2", "SimHits per det l2", - 200, -0.5, 199.5); - hsimHitsPerDet3 = new TH1F( "hsimHitsPerDet3", "SimHits per det l3", - 200, -0.5, 199.5); - hsimHitsPerLay1 = new TH1F( "hsimHitsPerLay1", "SimHits per layer l1", - 2000, -0.5, 1999.5); - hsimHitsPerLay2 = new TH1F( "hsimHitsPerLay2", "SimHits per layer l2", - 2000, -0.5, 1999.5); - hsimHitsPerLay3 = new TH1F( "hsimHitsPerLay3", "SimHits per layer l3", - 2000, -0.5, 1999.5); - hdetsPerLay1 = new TH1F( "hdetsPerLay1", "Full dets per layer l1", - 161, -0.5, 160.5); - hdetsPerLay3 = new TH1F( "hdetsPerLay3", "Full dets per layer l3", - 353, -0.5, 352.5); - hdetsPerLay2 = new TH1F( "hdetsPerLay2", "Full dets per layer l2", - 257, -0.5, 256.5); - heloss1e = new TH1F( "heloss1e", "Eloss e l1", 100, 0., max_charge); - heloss2e = new TH1F( "heloss2e", "Eloss e l2", 100, 0., max_charge); - heloss3e = new TH1F( "heloss3e", "Eloss e l3", 100, 0., max_charge); - - heloss1mu = new TH1F( "heloss1mu", "Eloss mu l1", 100, 0., max_charge); - heloss2mu = new TH1F( "heloss2mu", "Eloss mu l2", 100, 0., max_charge); - heloss3mu = new TH1F( "heloss3mu", "Eloss mu l3", 100, 0., max_charge); - - htheta1 = new TH1F( "htheta1", "Theta det1",350,0.0,3.5); - htheta2 = new TH1F( "htheta2", "Theta det2",350,0.0,3.5); - htheta3 = new TH1F( "htheta3", "Theta det3",350,0.0,3.5); - hphi1 = new TH1F("hphi1","phi l1",1400,-3.5,3.5); - hphi2 = new TH1F("hphi2","phi l2",1400,-3.5,3.5); - hphi3 = new TH1F("hphi3","phi l3",1400,-3.5,3.5); - hphi1h = new TH1F("hphi1h","phi l1",1400,-3.5,3.5); - - hdetr = new TH1F("hdetr","det r",1500,0.,15.); - hdetz = new TH1F("hdetz","det z",5200,-26.,26.); - hdetphi1 = new TH1F("hdetphi1","det phi l1",700,-3.5,3.5); - hdetphi2 = new TH1F("hdetphi2","det phi l2",700,-3.5,3.5); - hdetphi3 = new TH1F("hdetphi3","det phi l3",700,-3.5,3.5); - - hcolsB = new TH1F("hcolsB","cols per bar det",450,0.,450.); - hrowsB = new TH1F("hrowsB","rows per bar det",200,0.,200.); - hcolsF = new TH1F("hcolsF","cols per for det",300,0.,300.); - hrowsF = new TH1F("hrowsF","rows per for det",200,0.,200.); - - hladder1idUp = new TH1F( "hladder1idUp", "Ladder L1 id", 100, -0.5, 49.5); - hladder2idUp = new TH1F( "hladder2idUp", "Ladder L2 id", 100, -0.5, 49.5); - hladder3idUp = new TH1F( "hladder3idUp", "Ladder L3 id", 100, -0.5, 49.5); - - hglobr1 = new TH1F("hglobr1","global r1",150,0.,15.); - hglobz1 = new TH1F("hglobz1","global z1",540,-27.,27.); - hglobr2 = new TH1F("hglobr2","global r2",150,0.,15.); - hglobz2 = new TH1F("hglobz2","global z2",540,-27.,27.); - hglobr3 = new TH1F("hglobr3","global r3",150,0.,15.); - hglobz3 = new TH1F("hglobz3","global z3",540,-27.,27.); - - hglox1 = new TH1F("hglox1","global x in l1",200,-1.,1.); - hglobr1h = new TH1F("hglobr1h","global r1",700,4.1,4.8); - - htest = new TH2F("htest"," ",108,-27.,27.,35,-3.5,3.5); - htest2 = new TH2F("htest2"," ",108,-27.,27.,60,0.,600.); - htest3 = new TH2F("htest3"," ",240,-12.,12.,240,-12.,12.); - htest4 = new TH2F("htest4"," ",80,-4.,4.,100,-5.,5.); - - hp1 = new TProfile("hp1"," ",50,0.,50.); // default option - hp2 = new TProfile("hp2"," ",50,0.,50.," "); // option set to " " - hp3 = new TProfile("hp3"," ",50,0.,50.,-100.,100.); // with y limits - hp4 = new TProfile("hp4"," ",50,0.,50.); - hp5 = new TProfile("hp5"," ",50,0.,50.); + using namespace edm; + cout << "Initialize PixelSimHitsTest " << endl; + + // put here whatever you want to do at the beginning of the job + std::string outputFile = conf_.getParameter("OutputFile"); + hFile = new TFile(outputFile.c_str(), "RECREATE"); + + const float max_charge = 200.; // in ke + hBunchCrossing = new TH1F("hBunchCrossing", "Bunch Crossing", 10, -5., 5.); + heloss1 = new TH1F("heloss1", "Eloss l1", 100, 0., max_charge); + heloss2 = new TH1F("heloss2", "Eloss l2", 100, 0., max_charge); + heloss3 = new TH1F("heloss3", "Eloss l3", 100, 0., max_charge); + + hdetunit = new TH1F("hdetunit", "Det unit", 1000, 302000000., 302300000.); + hpabs = new TH1F("hpabs", "Pabs", 100, 0., 100.); + htof = new TH1F("htof", "TOF", 50, -25., 25.); + htof1m = new TH1F("htof1m", "TOF BC=-1", 250, -50., 75.); + htof0 = new TH1F("htof0", "TOF BC=0", 250, -50., 75.); + htof1p = new TH1F("htof1p", "TOF BC=+1", 250, -50., 75.); + htof2p = new TH1F("htof2p", "TOF BC=+2", 250, -50., 75.); + + hpid = new TH1F("hpid", "PID", 1000, 0., 1000.); + htid = new TH1F("htid", "Track id", 100, 0., 100.); + + hpixid = new TH1F("hpixid", "Pix det id", 10, 0., 10.); + hpixsubid = new TH1F("hpixsubid", "Pix Barrel id", 10, 0., 10.); + hlayerid = new TH1F("hlayerid", "Pix layer id", 10, 0., 10.); + hladder1id = new TH1F("hladder1id", "Ladder L1 id", 100, -0.5, 49.5); + hladder2id = new TH1F("hladder2id", "Ladder L2 id", 100, -0.5, 49.5); + hladder3id = new TH1F("hladder3id", "Ladder L3 id", 100, -0.5, 49.5); + hz1id = new TH1F("hz1id", "Z-index id L1", 10, 0., 10.); + hz2id = new TH1F("hz2id", "Z-index id L2", 10, 0., 10.); + hz3id = new TH1F("hz3id", "Z-index id L3", 10, 0., 10.); + + hthick1 = new TH1F("hthick1", "Det 1 Thinckess", 400, 0., 0.04); + hthick2 = new TH1F("hthick2", "Det 2 Thinckess", 400, 0., 0.04); + hthick3 = new TH1F("hthick3", "Det 3 Thinckess", 400, 0., 0.04); + + hlength1 = new TH1F("hlength1", "Det 1 Length", 700, -3.5, 3.5); + hlength2 = new TH1F("hlength2", "Det 2 Length", 700, -3.5, 3.5); + hlength3 = new TH1F("hlength3", "Det 3 Length", 700, -3.5, 3.5); + + hwidth1 = new TH1F("hwidth1", "Det 1 Width", 200, -1., 1.); + hwidth2 = new TH1F("hwidth2", "Det 2 Width", 200, -1., 1.); + hwidth3 = new TH1F("hwidth3", "Det 3 Width", 200, -1., 1.); + + hwidth1h = new TH1F("hwidth1h", "Det 1 Width half-m", 200, -1., 1.); + hwidth2h = new TH1F("hwidth2h", "Det 2 Width half-m", 200, -1., 1.); + hwidth3h = new TH1F("hwidth3h", "Det 3 Width half-m", 200, -1., 1.); + + hsimHitsPerDet1 = new TH1F("hsimHitsPerDet1", "SimHits per det l1", 200, -0.5, 199.5); + hsimHitsPerDet2 = new TH1F("hsimHitsPerDet2", "SimHits per det l2", 200, -0.5, 199.5); + hsimHitsPerDet3 = new TH1F("hsimHitsPerDet3", "SimHits per det l3", 200, -0.5, 199.5); + hsimHitsPerLay1 = new TH1F("hsimHitsPerLay1", "SimHits per layer l1", 2000, -0.5, 1999.5); + hsimHitsPerLay2 = new TH1F("hsimHitsPerLay2", "SimHits per layer l2", 2000, -0.5, 1999.5); + hsimHitsPerLay3 = new TH1F("hsimHitsPerLay3", "SimHits per layer l3", 2000, -0.5, 1999.5); + hdetsPerLay1 = new TH1F("hdetsPerLay1", "Full dets per layer l1", 161, -0.5, 160.5); + hdetsPerLay3 = new TH1F("hdetsPerLay3", "Full dets per layer l3", 353, -0.5, 352.5); + hdetsPerLay2 = new TH1F("hdetsPerLay2", "Full dets per layer l2", 257, -0.5, 256.5); + heloss1e = new TH1F("heloss1e", "Eloss e l1", 100, 0., max_charge); + heloss2e = new TH1F("heloss2e", "Eloss e l2", 100, 0., max_charge); + heloss3e = new TH1F("heloss3e", "Eloss e l3", 100, 0., max_charge); + + heloss1mu = new TH1F("heloss1mu", "Eloss mu l1", 100, 0., max_charge); + heloss2mu = new TH1F("heloss2mu", "Eloss mu l2", 100, 0., max_charge); + heloss3mu = new TH1F("heloss3mu", "Eloss mu l3", 100, 0., max_charge); + + htheta1 = new TH1F("htheta1", "Theta det1", 350, 0.0, 3.5); + htheta2 = new TH1F("htheta2", "Theta det2", 350, 0.0, 3.5); + htheta3 = new TH1F("htheta3", "Theta det3", 350, 0.0, 3.5); + hphi1 = new TH1F("hphi1", "phi l1", 1400, -3.5, 3.5); + hphi2 = new TH1F("hphi2", "phi l2", 1400, -3.5, 3.5); + hphi3 = new TH1F("hphi3", "phi l3", 1400, -3.5, 3.5); + hphi1h = new TH1F("hphi1h", "phi l1", 1400, -3.5, 3.5); + + hdetr = new TH1F("hdetr", "det r", 1500, 0., 15.); + hdetz = new TH1F("hdetz", "det z", 5200, -26., 26.); + hdetphi1 = new TH1F("hdetphi1", "det phi l1", 700, -3.5, 3.5); + hdetphi2 = new TH1F("hdetphi2", "det phi l2", 700, -3.5, 3.5); + hdetphi3 = new TH1F("hdetphi3", "det phi l3", 700, -3.5, 3.5); + + hcolsB = new TH1F("hcolsB", "cols per bar det", 450, 0., 450.); + hrowsB = new TH1F("hrowsB", "rows per bar det", 200, 0., 200.); + hcolsF = new TH1F("hcolsF", "cols per for det", 300, 0., 300.); + hrowsF = new TH1F("hrowsF", "rows per for det", 200, 0., 200.); + + hladder1idUp = new TH1F("hladder1idUp", "Ladder L1 id", 100, -0.5, 49.5); + hladder2idUp = new TH1F("hladder2idUp", "Ladder L2 id", 100, -0.5, 49.5); + hladder3idUp = new TH1F("hladder3idUp", "Ladder L3 id", 100, -0.5, 49.5); + + hglobr1 = new TH1F("hglobr1", "global r1", 150, 0., 15.); + hglobz1 = new TH1F("hglobz1", "global z1", 540, -27., 27.); + hglobr2 = new TH1F("hglobr2", "global r2", 150, 0., 15.); + hglobz2 = new TH1F("hglobz2", "global z2", 540, -27., 27.); + hglobr3 = new TH1F("hglobr3", "global r3", 150, 0., 15.); + hglobz3 = new TH1F("hglobz3", "global z3", 540, -27., 27.); + + hglox1 = new TH1F("hglox1", "global x in l1", 200, -1., 1.); + hglobr1h = new TH1F("hglobr1h", "global r1", 700, 4.1, 4.8); + + htest = new TH2F("htest", " ", 108, -27., 27., 35, -3.5, 3.5); + htest2 = new TH2F("htest2", " ", 108, -27., 27., 60, 0., 600.); + htest3 = new TH2F("htest3", " ", 240, -12., 12., 240, -12., 12.); + htest4 = new TH2F("htest4", " ", 80, -4., 4., 100, -5., 5.); + + hp1 = new TProfile("hp1", " ", 50, 0., 50.); // default option + hp2 = new TProfile("hp2", " ", 50, 0., 50., " "); // option set to " " + hp3 = new TProfile("hp3", " ", 50, 0., 50., -100., 100.); // with y limits + hp4 = new TProfile("hp4", " ", 50, 0., 50.); + hp5 = new TProfile("hp5", " ", 50, 0., 50.); #ifdef CHECK_GEOM - // To get the module position - for(int i=0;i<3;i++) { - for(int n=0;n<44;n++) { - for(int m=0;m<8;m++) { - modulePositionR[i][n][m]=-1; - modulePositionZ[i][n][m]=-1; - modulePositionPhi[i][n][m]=-1; - } + // To get the module position + for (int i = 0; i < 3; i++) { + for (int n = 0; n < 44; n++) { + for (int m = 0; m < 8; m++) { + modulePositionR[i][n][m] = -1; + modulePositionZ[i][n][m] = -1; + modulePositionPhi[i][n][m] = -1; } } + } #endif } // ------------ method called to produce the data ------------ -void PixelMixedSimHitsTest::analyze(const edm::Event& iEvent, - const edm::EventSetup& iSetup) { +void PixelMixedSimHitsTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopo; iSetup.get().get(tTopo); - const double PI = 3.142; using namespace edm; - if(PRINT) cout<<" Analyze PixelSimHitsTest "< geom; - iSetup.get().get( geom ); - const TrackerGeometry& theTracker(*geom); - + iSetup.get().get(geom); + const TrackerGeometry &theTracker(*geom); + // Get input data int totalNumOfSimHits = 0; int totalNumOfSimHits1 = 0; int totalNumOfSimHits2 = 0; int totalNumOfSimHits3 = 0; - // To count simhits per det module - //typedef std::map, - //std::less> simhit_map; - //typedef simhit_map::iterator simhit_map_iterator; - //simhit_map SimHitMap; - map, less > SimHitMap1; - map, less > SimHitMap2; - map, less > SimHitMap3; - -// Handle PixelBarrelHitsLowTof; -// Handle PixelBarrelHitsHighTof; - -// iEvent.getByLabel("SimG4Object","TrackerHitsPixelBarrelLowTof",PixelBarrelHitsLowTof); -// iEvent.getByLabel("SimG4Object","TrackerHitsPixelBarrelHighTof",PixelBarrelHitsHighTof); - - // Step A: Get Inputs - edm::Handle cf; - iEvent.getByType(cf); - - std::unique_ptr > allPixelTrackerHits(new MixCollection(cf.product(),trackerContainers)); - - // for(vector::const_iterator isim = PixelBarrelHitsLowTof->begin(); - // isim != PixelBarrelHitsLowTof->end(); ++isim){ - - MixCollection::iterator isim; - for (isim=allPixelTrackerHits->begin(); isim!= allPixelTrackerHits->end();isim++) { - - totalNumOfSimHits++; - // Det id - DetId detId=DetId((*isim).detUnitId()); - unsigned int detid=detId.det(); // for pixel=1 - unsigned int subid=detId.subdetId();// barrel=1 - - if(detid!=1 && subid!=1) cout<<" error in det id "< ( theTracker.idToDet(detId) ); - double detZ = theGeomDet->surface().position().z(); - double detR = theGeomDet->surface().position().perp(); - double detPhi = theGeomDet->surface().position().phi(); - hdetr->Fill(detR); - hdetz->Fill(detZ); - - //const BoundPlane plane = theGeomDet->surface(); // does not work - - double detThick = theGeomDet->specificSurface().bounds().thickness(); - double detLength = theGeomDet->specificSurface().bounds().length(); - double detWidth = theGeomDet->specificSurface().bounds().width(); - - int cols = theGeomDet->specificTopology().ncolumns(); - int rows = theGeomDet->specificTopology().nrows(); - - hcolsB->Fill(float(cols)); - hrowsB->Fill(float(rows)); - if(PRINT) cout<<"det z/r "<pxbLayer(detId.rawId); - unsigned int ladder=tTopo->pxbLadder(detId.rawId); - unsigned int zindex=tTopo->pxbModule(detId.rawId); - if(PRINT) cout<<"det id "<, + //std::less> simhit_map; + //typedef simhit_map::iterator simhit_map_iterator; + //simhit_map SimHitMap; + map, less > SimHitMap1; + map, less > SimHitMap2; + map, less > SimHitMap3; + + // Handle PixelBarrelHitsLowTof; + // Handle PixelBarrelHitsHighTof; + + // iEvent.getByLabel("SimG4Object","TrackerHitsPixelBarrelLowTof",PixelBarrelHitsLowTof); + // iEvent.getByLabel("SimG4Object","TrackerHitsPixelBarrelHighTof",PixelBarrelHitsHighTof); + + // Step A: Get Inputs + edm::Handle cf; + iEvent.getByType(cf); + + std::unique_ptr > allPixelTrackerHits( + new MixCollection(cf.product(), trackerContainers)); + + // for(vector::const_iterator isim = PixelBarrelHitsLowTof->begin(); + // isim != PixelBarrelHitsLowTof->end(); ++isim){ + + MixCollection::iterator isim; + for (isim = allPixelTrackerHits->begin(); isim != allPixelTrackerHits->end(); isim++) { + totalNumOfSimHits++; + // Det id + DetId detId = DetId((*isim).detUnitId()); + unsigned int detid = detId.det(); // for pixel=1 + unsigned int subid = detId.subdetId(); // barrel=1 + + if (detid != 1 && subid != 1) + cout << " error in det id " << detid << " " << subid << endl; + //if(PRINT) cout<<(*isim).detUnitId()<<" "<(theTracker.idToDet(detId)); + double detZ = theGeomDet->surface().position().z(); + double detR = theGeomDet->surface().position().perp(); + double detPhi = theGeomDet->surface().position().phi(); + hdetr->Fill(detR); + hdetz->Fill(detZ); + + //const BoundPlane plane = theGeomDet->surface(); // does not work + + double detThick = theGeomDet->specificSurface().bounds().thickness(); + double detLength = theGeomDet->specificSurface().bounds().length(); + double detWidth = theGeomDet->specificSurface().bounds().width(); + + int cols = theGeomDet->specificTopology().ncolumns(); + int rows = theGeomDet->specificTopology().nrows(); + + hcolsB->Fill(float(cols)); + hrowsB->Fill(float(rows)); + if (PRINT) + cout << "det z/r " << detZ << " " << detR << " " << detThick << " " << detLength << " " << detWidth << " " << cols + << " " << rows << endl; + + unsigned int layer = tTopo->pxbLayer(detId.rawId); + unsigned int ladder = tTopo->pxbLadder(detId.rawId); + unsigned int zindex = tTopo->pxbModule(detId.rawId); + if (PRINT) + cout << "det id " << detId.rawId() << " " << detid << " " << subid << " " << layer << " " << ladder << " " + << zindex << endl; #ifdef CHECK_GEOM - // To get the module position - modulePositionR[layer-1][ladder-1][zindex-1] = detR; - modulePositionZ[layer-1][ladder-1][zindex-1] = detZ; - modulePositionPhi[layer-1][ladder-1][zindex-1] = detPhi; + // To get the module position + modulePositionR[layer - 1][ladder - 1][zindex - 1] = detR; + modulePositionZ[layer - 1][ladder - 1][zindex - 1] = detZ; + modulePositionPhi[layer - 1][ladder - 1][zindex - 1] = detPhi; #endif - // SimHit information - float eloss = (*isim).energyLoss() * 1000000/3.7;//convert GeV to ke - float tof = (*isim).timeOfFlight(); - float p = (*isim).pabs(); - float theta = (*isim).thetaAtEntry(); - float phi = (*isim).phiAtEntry(); - int pid = abs((*isim).particleType()); // ignore sign - int tid = (*isim).trackId(); - int procType = (*isim).processType(); - - float x = (*isim).entryPoint().x(); // width (row index, in col direction) - float y = (*isim).entryPoint().y(); // length (col index, in row direction) - float z = (*isim).entryPoint().z(); // thick - - float x2 = (*isim).exitPoint().x(); - float y2 = (*isim).exitPoint().y(); - float z2 = (*isim).exitPoint().z(); - int bcrossing = (*isim).eventId().bunchCrossing(); - - float dz = abs(z-z2); - bool moduleDirectionUp = ( z < z2 ); // for positive direction z2>z - - float xpos = (x+x2)/2.; - float ypos = (y+y2)/2.; - float zpos = (z+z2)/2.; - - if(PRINT) cout<<" simhit "<surface().toGlobal(loc); // does not work! - double gloX = theGeomDet->surface().toGlobal(loc).x(); // - double gloY = theGeomDet->surface().toGlobal(loc).y(); // - double gloR = theGeomDet->surface().toGlobal(loc).perp(); // - double gloZ = theGeomDet->surface().toGlobal(loc).z(); // - if(PRINT) cout<<", global "<Fill(gloX,gloY); - hdetunit->Fill(float(detId.rawId())); - hpabs->Fill(p); - htof->Fill(tof); - hpid->Fill(float(pid)); - htid->Fill(float(tid)); - hpixid->Fill(float(detid)); - hpixsubid->Fill(float(subid)); - hlayerid->Fill(float(layer)); - hBunchCrossing->Fill(float(bcrossing)); - if (bcrossing == -1) htof1m->Fill(tof); - else if(bcrossing == 0) htof0->Fill(tof); - else if(bcrossing == 1) htof1p->Fill(tof); - else if(bcrossing == 2) htof2p->Fill(tof); - - // Transform the theta from local module coordinates to global - //if(theta<= PI/2.) theta = PI/2. - theta; // For +z global - //else theta = (PI/2. + PI) - theta; - - if(layer==1) { - //cout<<" layer "<Fill(eloss); - if(pid==11) heloss1e->Fill(eloss); - else heloss1mu->Fill(eloss); - hladder1id->Fill(float(ladder)); - hz1id->Fill(float(zindex)); - hthick1->Fill(dz); - hlength1->Fill(y); - if(ladder==5 || ladder==6 || ladder==15 || ladder==16 ) { - // half-modules - hwidth1h->Fill(x); - if(pid==13 && p>1.) { // select primary muons - hphi1h->Fill(phi); - hglox1->Fill(gloX); - hglobr1h->Fill(gloR); - -// double gloX1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).x(); // -// double gloY1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).y(); // -// double gloR1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).perp(); -// cout<<" "<Fill(x); - if(pid==13 && p>1.) hphi1->Fill(phi); - } - SimHitMap1[detId.rawId()].push_back((*isim)); - htheta1->Fill(theta); - hglobr1->Fill(gloR); - hglobz1->Fill(gloZ); - - // Check the coordinate system and counting - htest->Fill(gloZ,ypos); - if(pid != 11) htest2->Fill(gloZ,eloss); - - if(pid!=11 && moduleDirectionUp) - hladder1idUp->Fill(float(ladder)); - - if(ladder==6) htest4->Fill(xpos,gloX); - hp1->Fill(float(ladder),detR,1); - hp2->Fill(float(ladder),detPhi); - hdetphi1->Fill(detPhi); - - } else if(layer==2) { - //cout<<" layer "<Fill(eloss); - if(pid==11) heloss2e->Fill(eloss); - else heloss2mu->Fill(eloss); - hladder2id->Fill(float(ladder)); - hz2id->Fill(float(zindex)); - hthick2->Fill(dz); - hlength2->Fill(y); - if(ladder==8 || ladder==9 || ladder==24 || ladder==25 ) { - hwidth2h->Fill(x); - } else { - hwidth2->Fill(x); - if(pid==13 && p>1.) hphi2->Fill(phi); - } - SimHitMap2[detId.rawId()].push_back((*isim)); - hglobr2->Fill(gloR); - hglobz2->Fill(gloZ); - hdetphi2->Fill(detPhi); - if(pid!=11 && moduleDirectionUp) hladder2idUp->Fill(float(ladder)); - - } else if(layer==3) { - //cout<<" layer "<Fill(eloss); - if(pid==11) heloss3e->Fill(eloss); - else heloss3mu->Fill(eloss); - - hladder3id->Fill(float(ladder)); - hz3id->Fill(float(zindex)); - hthick3->Fill(dz); - hlength3->Fill(y); - if(ladder==11 || ladder==12 || ladder==33 || ladder==34 ) { - hwidth3h->Fill(x); - } else { - hwidth3->Fill(x); - if(pid==13 && p>1.) hphi3->Fill(phi); - } - SimHitMap3[detId.rawId()].push_back((*isim)); - hglobr3->Fill(gloR); - hglobz3->Fill(gloZ); - hdetphi3->Fill(detPhi); - if(pid!=11 && moduleDirectionUp) hladder3idUp->Fill(float(ladder)); - } - } - - - hsimHitsPerLay1 ->Fill(float(totalNumOfSimHits1)); - hsimHitsPerLay2 ->Fill(float(totalNumOfSimHits2)); - hsimHitsPerLay3 ->Fill(float(totalNumOfSimHits3)); - - int numberOfDetUnits1 = SimHitMap1.size(); - int numberOfDetUnits2 = SimHitMap2.size(); - int numberOfDetUnits3 = SimHitMap3.size(); - int numberOfDetUnits = numberOfDetUnits1+numberOfDetUnits2+ - numberOfDetUnits3; - - if(PRINT) - cout << " Number of full det-units = " <surface().toGlobal(loc); // does not work! + double gloX = theGeomDet->surface().toGlobal(loc).x(); // + double gloY = theGeomDet->surface().toGlobal(loc).y(); // + double gloR = theGeomDet->surface().toGlobal(loc).perp(); // + double gloZ = theGeomDet->surface().toGlobal(loc).z(); // + if (PRINT) + cout << ", global " << gloX << " " << gloY << " " << gloR << " " << gloZ << endl; + + htest3->Fill(gloX, gloY); + hdetunit->Fill(float(detId.rawId())); + hpabs->Fill(p); + htof->Fill(tof); + hpid->Fill(float(pid)); + htid->Fill(float(tid)); + hpixid->Fill(float(detid)); + hpixsubid->Fill(float(subid)); + hlayerid->Fill(float(layer)); + hBunchCrossing->Fill(float(bcrossing)); + if (bcrossing == -1) + htof1m->Fill(tof); + else if (bcrossing == 0) + htof0->Fill(tof); + else if (bcrossing == 1) + htof1p->Fill(tof); + else if (bcrossing == 2) + htof2p->Fill(tof); + + // Transform the theta from local module coordinates to global + //if(theta<= PI/2.) theta = PI/2. - theta; // For +z global + //else theta = (PI/2. + PI) - theta; + + if (layer == 1) { + //cout<<" layer "<Fill(eloss); + if (pid == 11) + heloss1e->Fill(eloss); + else + heloss1mu->Fill(eloss); + hladder1id->Fill(float(ladder)); + hz1id->Fill(float(zindex)); + hthick1->Fill(dz); + hlength1->Fill(y); + if (ladder == 5 || ladder == 6 || ladder == 15 || ladder == 16) { + // half-modules + hwidth1h->Fill(x); + if (pid == 13 && p > 1.) { // select primary muons + hphi1h->Fill(phi); + hglox1->Fill(gloX); + hglobr1h->Fill(gloR); + + // double gloX1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).x(); // + // double gloY1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).y(); // + // double gloR1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).perp(); + // cout<<" "<Fill(x); + if (pid == 13 && p > 1.) + hphi1->Fill(phi); + } + SimHitMap1[detId.rawId()].push_back((*isim)); + htheta1->Fill(theta); + hglobr1->Fill(gloR); + hglobz1->Fill(gloZ); + + // Check the coordinate system and counting + htest->Fill(gloZ, ypos); + if (pid != 11) + htest2->Fill(gloZ, eloss); + + if (pid != 11 && moduleDirectionUp) + hladder1idUp->Fill(float(ladder)); + + if (ladder == 6) + htest4->Fill(xpos, gloX); + hp1->Fill(float(ladder), detR, 1); + hp2->Fill(float(ladder), detPhi); + hdetphi1->Fill(detPhi); + + } else if (layer == 2) { + //cout<<" layer "<Fill(eloss); + if (pid == 11) + heloss2e->Fill(eloss); + else + heloss2mu->Fill(eloss); + hladder2id->Fill(float(ladder)); + hz2id->Fill(float(zindex)); + hthick2->Fill(dz); + hlength2->Fill(y); + if (ladder == 8 || ladder == 9 || ladder == 24 || ladder == 25) { + hwidth2h->Fill(x); + } else { + hwidth2->Fill(x); + if (pid == 13 && p > 1.) + hphi2->Fill(phi); + } + SimHitMap2[detId.rawId()].push_back((*isim)); + hglobr2->Fill(gloR); + hglobz2->Fill(gloZ); + hdetphi2->Fill(detPhi); + if (pid != 11 && moduleDirectionUp) + hladder2idUp->Fill(float(ladder)); + + } else if (layer == 3) { + //cout<<" layer "<Fill(eloss); + if (pid == 11) + heloss3e->Fill(eloss); + else + heloss3mu->Fill(eloss); + + hladder3id->Fill(float(ladder)); + hz3id->Fill(float(zindex)); + hthick3->Fill(dz); + hlength3->Fill(y); + if (ladder == 11 || ladder == 12 || ladder == 33 || ladder == 34) { + hwidth3h->Fill(x); + } else { + hwidth3->Fill(x); + if (pid == 13 && p > 1.) + hphi3->Fill(phi); + } + SimHitMap3[detId.rawId()].push_back((*isim)); + hglobr3->Fill(gloR); + hglobz3->Fill(gloZ); + hdetphi3->Fill(detPhi); + if (pid != 11 && moduleDirectionUp) + hladder3idUp->Fill(float(ladder)); + } + } + + hsimHitsPerLay1->Fill(float(totalNumOfSimHits1)); + hsimHitsPerLay2->Fill(float(totalNumOfSimHits2)); + hsimHitsPerLay3->Fill(float(totalNumOfSimHits3)); + + int numberOfDetUnits1 = SimHitMap1.size(); + int numberOfDetUnits2 = SimHitMap2.size(); + int numberOfDetUnits3 = SimHitMap3.size(); + int numberOfDetUnits = numberOfDetUnits1 + numberOfDetUnits2 + numberOfDetUnits3; + if (PRINT) + cout << " Number of full det-units = " << numberOfDetUnits << " total simhits = " << totalNumOfSimHits << endl; + hdetsPerLay1->Fill(float(numberOfDetUnits1)); + hdetsPerLay2->Fill(float(numberOfDetUnits2)); + hdetsPerLay3->Fill(float(numberOfDetUnits3)); + + map, less >::iterator simhit_map_iterator; + for (simhit_map_iterator = SimHitMap1.begin(); simhit_map_iterator != SimHitMap1.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay1 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet1->Fill(float((simhit_map_iterator->second).size())); + } + for (simhit_map_iterator = SimHitMap2.begin(); simhit_map_iterator != SimHitMap2.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay2 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet2->Fill(float((simhit_map_iterator->second).size())); + } + for (simhit_map_iterator = SimHitMap3.begin(); simhit_map_iterator != SimHitMap3.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay3 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet3->Fill(float((simhit_map_iterator->second).size())); + } } // ------------ method called to at the end of the job ------------ -void PixelMixedSimHitsTest::endJob(){ +void PixelMixedSimHitsTest::endJob() { cout << " End PixelSimHitsTest " << endl; hFile->Write(); hFile->Close(); #ifdef CHECK_GEOM // To get module positions - cout<< " Module position"< daemon; //daemon.operator->(); - cout<<" Construct PixelSimHitsTestForward "< tTopo; iSetup.get().get(tTopo); - const double PI = 3.142; using namespace edm; - if(PRINT) cout<<" Analyze PixelSimHitsTestForward "< geom; - iSetup.get().get( geom ); - const TrackerGeometry& theTracker(*geom); - + iSetup.get().get(geom); + const TrackerGeometry &theTracker(*geom); + // Get input data int totalNumOfSimHits = 0; int totalNumOfSimHits1 = 0; int totalNumOfSimHits2 = 0; int totalNumOfSimHits3 = 0; - // To count simhits per det module - //typedef std::map, - //std::less> simhit_map; - //typedef simhit_map::iterator simhit_map_iterator; - //simhit_map SimHitMap; - map, less > SimHitMap1; - map, less > SimHitMap2; - map, less > SimHitMap3; - - Handle PixelForwardHitsLowTof; - Handle PixelForwardHitsHighTof; - - iEvent.getByLabel("g4SimHits","TrackerHitsPixelEndcapLowTof", - PixelForwardHitsLowTof); - iEvent.getByLabel("g4SimHits","TrackerHitsPixelEndcapHighTof", - PixelForwardHitsHighTof); - - //vector pixelHits; - //pixelHits.insert(pixelHits.end(),PixelBarrelHitsLowTof->begin(), - // PixelBarrelHitsLowTof->end()); - - //cout<<" size = "<size()<::const_iterator isim = PixelBarrelHitsHighTof->begin(); - // isim != PixelBarrelHitsHighTof->end(); ++isim){ - for(vector::const_iterator isim = PixelForwardHitsLowTof->begin(); - isim != PixelForwardHitsLowTof->end(); ++isim){ - - totalNumOfSimHits++; - // Det id - DetId detId=DetId((*isim).detUnitId()); - unsigned int detid=detId.det(); // for pixel=1 - unsigned int subid=detId.subdetId();// barrel=1, forward=2 - - if(detid!=1 && subid!=2) cout<<" error in det id "< ( theTracker.idToDet(detId) ); - double detZ = theGeomDet->surface().position().z(); - double detR = theGeomDet->surface().position().perp(); - double detPhi = theGeomDet->surface().position().phi(); - hdetr->Fill(detR); - hdetz->Fill(detZ); - - //const BoundPlane plane = theGeomDet->surface(); // does not work - - double detThick = theGeomDet->specificSurface().bounds().thickness(); - double detLength = theGeomDet->specificSurface().bounds().length(); - double detWidth = theGeomDet->specificSurface().bounds().width(); - - int cols = theGeomDet->specificTopology().ncolumns(); - int rows = theGeomDet->specificTopology().nrows(); - - hcolsB->Fill(float(cols)); - hrowsB->Fill(float(rows)); - if(PRINT) cout<<"Forward det z/r "<pxfDisk(detId); //1,2,3 - unsigned int blade=tTopo->pxfBlade(detId); //1-24 - unsigned int zindex=tTopo->pxfModule(detId); // - unsigned int side=tTopo->pxfSide(detId); //size=1 for -z, 2 for +z - unsigned int panel=tTopo->pxfPanel(detId); //panel=1 - - if(PRINT) cout<<"det "<z - - float xpos = (x+x2)/2.; - float ypos = (y+y2)/2.; - float zpos = (z+z2)/2.; - - if(PRINT) cout<<"simhit "<surface().toGlobal(loc); // does not work! - double gloX = theGeomDet->surface().toGlobal(loc).x(); // - double gloY = theGeomDet->surface().toGlobal(loc).y(); // - double gloR = theGeomDet->surface().toGlobal(loc).perp(); // - double gloZ = theGeomDet->surface().toGlobal(loc).z(); // - if(PRINT) cout<<", global "<Fill(gloX,gloY); - hdetunit->Fill(float(detId.rawId())); - hpabs->Fill(p); - htof->Fill(tof); - hpid->Fill(float(pid)); - htid->Fill(float(tid)); - hpixid->Fill(float(detid)); - hpixsubid->Fill(float(subid)); - hlayerid->Fill(float(disk)); - - // Transform the theta from local module coordinates to global - //if(theta<= PI/2.) theta = PI/2. - theta; // For +z global - //else theta = (PI/2. + PI) - theta; - - if(disk==1) { - //cout<<" disk "<Fill(eloss); - if(pid==11) heloss1e->Fill(eloss); - else heloss1mu->Fill(eloss); - hladder1id->Fill(float(blade)); - hz1id->Fill(float(zindex)); - hthick1->Fill(dz); - hlength1->Fill(y); - if(blade==5 || blade==6 || blade==15 || blade==16 ) { - // half-modules - hwidth1h->Fill(x); - if(pid==13 && p>1.) { // select primary muons - hphi1h->Fill(phi); - hglox1->Fill(gloX); - hglobr1h->Fill(gloR); - -// double gloX1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).x(); // -// double gloY1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).y(); // -// double gloR1 = -// theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).perp(); -// cout<<" "<Fill(x); - if(pid==13 && p>1.) hphi1->Fill(phi); - } - SimHitMap1[detId.rawId()].push_back((*isim)); - htheta1->Fill(theta); - hglobr1->Fill(gloR); - hglobz1->Fill(gloZ); - - // Check the coordinate system and counting - htest->Fill(gloZ,ypos); - if(pid != 11) htest2->Fill(gloZ,eloss); - - if(pid!=11 && moduleDirectionUp) - hladder1idUp->Fill(float(blade)); - - if(blade==6) htest4->Fill(xpos,gloX); - hp1->Fill(float(blade),detR,1); - hp2->Fill(float(blade),detPhi); - hdetphi1->Fill(detPhi); - - } else if(disk==2) { - //cout<<" disk "<Fill(eloss); - if(pid==11) heloss2e->Fill(eloss); - else heloss2mu->Fill(eloss); - hladder2id->Fill(float(blade)); - hz2id->Fill(float(zindex)); - hthick2->Fill(dz); - hlength2->Fill(y); - if(blade==8 || blade==9 || blade==24 || blade==25 ) { - hwidth2h->Fill(x); - } else { - hwidth2->Fill(x); - if(pid==13 && p>1.) hphi2->Fill(phi); - } - SimHitMap2[detId.rawId()].push_back((*isim)); - hglobr2->Fill(gloR); - hglobz2->Fill(gloZ); - hdetphi2->Fill(detPhi); - if(pid!=11 && moduleDirectionUp) hladder2idUp->Fill(float(blade)); - - } else if(disk==3) { - //cout<<" disk "<Fill(eloss); - if(pid==11) heloss3e->Fill(eloss); - else heloss3mu->Fill(eloss); - - hladder3id->Fill(float(blade)); - hz3id->Fill(float(zindex)); - hthick3->Fill(dz); - hlength3->Fill(y); - if(blade==11 || blade==12 || blade==33 || blade==34 ) { - hwidth3h->Fill(x); - } else { - hwidth3->Fill(x); - if(pid==13 && p>1.) hphi3->Fill(phi); - } - SimHitMap3[detId.rawId()].push_back((*isim)); - hglobr3->Fill(gloR); - hglobz3->Fill(gloZ); - hdetphi3->Fill(detPhi); - if(pid!=11 && moduleDirectionUp) hladder3idUp->Fill(float(blade)); - } - } - - - hsimHitsPerLay1 ->Fill(float(totalNumOfSimHits1)); - hsimHitsPerLay2 ->Fill(float(totalNumOfSimHits2)); - hsimHitsPerLay3 ->Fill(float(totalNumOfSimHits3)); - - int numberOfDetUnits1 = SimHitMap1.size(); - int numberOfDetUnits2 = SimHitMap2.size(); - int numberOfDetUnits3 = SimHitMap3.size(); - int numberOfDetUnits = numberOfDetUnits1+numberOfDetUnits2+ - numberOfDetUnits3; - - if(PRINT) - cout << " Number of full det-units = " < pixelHits; + //pixelHits.insert(pixelHits.end(),PixelBarrelHitsLowTof->begin(), + // PixelBarrelHitsLowTof->end()); + + //cout<<" size = "<size()<::const_iterator isim = PixelBarrelHitsHighTof->begin(); + // isim != PixelBarrelHitsHighTof->end(); ++isim){ + for (vector::const_iterator isim = PixelForwardHitsLowTof->begin(); isim != PixelForwardHitsLowTof->end(); + ++isim) { + totalNumOfSimHits++; + // Det id + DetId detId = DetId((*isim).detUnitId()); + unsigned int detid = detId.det(); // for pixel=1 + unsigned int subid = detId.subdetId(); // barrel=1, forward=2 + + if (detid != 1 && subid != 2) + cout << " error in det id " << detid << " " << subid << endl; + //if(PRINT) cout<<" Forward det id "<<(*isim).detUnitId()<<" "<(theTracker.idToDet(detId)); + double detZ = theGeomDet->surface().position().z(); + double detR = theGeomDet->surface().position().perp(); + double detPhi = theGeomDet->surface().position().phi(); + hdetr->Fill(detR); + hdetz->Fill(detZ); + + //const BoundPlane plane = theGeomDet->surface(); // does not work + + double detThick = theGeomDet->specificSurface().bounds().thickness(); + double detLength = theGeomDet->specificSurface().bounds().length(); + double detWidth = theGeomDet->specificSurface().bounds().width(); + + int cols = theGeomDet->specificTopology().ncolumns(); + int rows = theGeomDet->specificTopology().nrows(); + + hcolsB->Fill(float(cols)); + hrowsB->Fill(float(rows)); + if (PRINT) + cout << "Forward det z/r " << detZ << " " << detR << " " << detThick << " " << detLength << " " << detWidth << " " + << cols << " " << rows << endl; + + unsigned int disk = tTopo->pxfDisk(detId); //1,2,3 + unsigned int blade = tTopo->pxfBlade(detId); //1-24 + unsigned int zindex = tTopo->pxfModule(detId); // + unsigned int side = tTopo->pxfSide(detId); //size=1 for -z, 2 for +z + unsigned int panel = tTopo->pxfPanel(detId); //panel=1 + + if (PRINT) + cout << "det " << subid << ", disk " << disk << ", blade " << blade << ", module " << zindex << ", side " << side + << ", panel " << panel << " pos = " << detZ << " " << detR << " " << detPhi << endl; + // To get the module position + // modulePositionR[disk-1][blade-1][zindex-1] = detR; + // modulePositionZ[disk-1][blade-1][zindex-1] = detZ; + // modulePositionPhi[disk-1][blade-1][zindex-1] = detPhi; + + // SimHit information + float eloss = (*isim).energyLoss() * 1000000 / 3.7; //convert GeV to ke + float tof = (*isim).timeOfFlight(); + float p = (*isim).pabs(); + float theta = (*isim).thetaAtEntry(); + float phi = (*isim).phiAtEntry(); + int pid = abs((*isim).particleType()); // ignore sign + int tid = (*isim).trackId(); + int procType = (*isim).processType(); + + float x = (*isim).entryPoint().x(); // width (row index, in col direction) + float y = (*isim).entryPoint().y(); // length (col index, in row direction) + float z = (*isim).entryPoint().z(); // thick + + float x2 = (*isim).exitPoint().x(); + float y2 = (*isim).exitPoint().y(); + float z2 = (*isim).exitPoint().z(); + + float dz = abs(z - z2); + bool moduleDirectionUp = (z < z2); // for positive direction z2>z + + float xpos = (x + x2) / 2.; + float ypos = (y + y2) / 2.; + float zpos = (z + z2) / 2.; + + if (PRINT) + cout << "simhit " << pid << " " << tid << " " << procType << " " << tof << " " << eloss << " " << p << " " << x + << " " << y << " " << z << " " << dz << endl; + if (PRINT) + cout << " pos " << xpos << " " << ypos << " " << zpos; + + LocalPoint loc(xpos, ypos, zpos); + //GlobalPoint glo = theGeomDet->surface().toGlobal(loc); // does not work! + double gloX = theGeomDet->surface().toGlobal(loc).x(); // + double gloY = theGeomDet->surface().toGlobal(loc).y(); // + double gloR = theGeomDet->surface().toGlobal(loc).perp(); // + double gloZ = theGeomDet->surface().toGlobal(loc).z(); // + if (PRINT) + cout << ", global " << gloX << " " << gloY << " " << gloR << " " << gloZ << endl; + + htest3->Fill(gloX, gloY); + hdetunit->Fill(float(detId.rawId())); + hpabs->Fill(p); + htof->Fill(tof); + hpid->Fill(float(pid)); + htid->Fill(float(tid)); + hpixid->Fill(float(detid)); + hpixsubid->Fill(float(subid)); + hlayerid->Fill(float(disk)); + + // Transform the theta from local module coordinates to global + //if(theta<= PI/2.) theta = PI/2. - theta; // For +z global + //else theta = (PI/2. + PI) - theta; + + if (disk == 1) { + //cout<<" disk "<Fill(eloss); + if (pid == 11) + heloss1e->Fill(eloss); + else + heloss1mu->Fill(eloss); + hladder1id->Fill(float(blade)); + hz1id->Fill(float(zindex)); + hthick1->Fill(dz); + hlength1->Fill(y); + if (blade == 5 || blade == 6 || blade == 15 || blade == 16) { + // half-modules + hwidth1h->Fill(x); + if (pid == 13 && p > 1.) { // select primary muons + hphi1h->Fill(phi); + hglox1->Fill(gloX); + hglobr1h->Fill(gloR); + + // double gloX1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).x(); // + // double gloY1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).y(); // + // double gloR1 = + // theGeomDet->surface().toGlobal(LocalPoint(0,0,0)).perp(); + // cout<<" "<Fill(x); + if (pid == 13 && p > 1.) + hphi1->Fill(phi); + } + SimHitMap1[detId.rawId()].push_back((*isim)); + htheta1->Fill(theta); + hglobr1->Fill(gloR); + hglobz1->Fill(gloZ); + + // Check the coordinate system and counting + htest->Fill(gloZ, ypos); + if (pid != 11) + htest2->Fill(gloZ, eloss); + + if (pid != 11 && moduleDirectionUp) + hladder1idUp->Fill(float(blade)); + + if (blade == 6) + htest4->Fill(xpos, gloX); + hp1->Fill(float(blade), detR, 1); + hp2->Fill(float(blade), detPhi); + hdetphi1->Fill(detPhi); + + } else if (disk == 2) { + //cout<<" disk "<Fill(eloss); + if (pid == 11) + heloss2e->Fill(eloss); + else + heloss2mu->Fill(eloss); + hladder2id->Fill(float(blade)); + hz2id->Fill(float(zindex)); + hthick2->Fill(dz); + hlength2->Fill(y); + if (blade == 8 || blade == 9 || blade == 24 || blade == 25) { + hwidth2h->Fill(x); + } else { + hwidth2->Fill(x); + if (pid == 13 && p > 1.) + hphi2->Fill(phi); + } + SimHitMap2[detId.rawId()].push_back((*isim)); + hglobr2->Fill(gloR); + hglobz2->Fill(gloZ); + hdetphi2->Fill(detPhi); + if (pid != 11 && moduleDirectionUp) + hladder2idUp->Fill(float(blade)); + + } else if (disk == 3) { + //cout<<" disk "<Fill(eloss); + if (pid == 11) + heloss3e->Fill(eloss); + else + heloss3mu->Fill(eloss); + + hladder3id->Fill(float(blade)); + hz3id->Fill(float(zindex)); + hthick3->Fill(dz); + hlength3->Fill(y); + if (blade == 11 || blade == 12 || blade == 33 || blade == 34) { + hwidth3h->Fill(x); + } else { + hwidth3->Fill(x); + if (pid == 13 && p > 1.) + hphi3->Fill(phi); + } + SimHitMap3[detId.rawId()].push_back((*isim)); + hglobr3->Fill(gloR); + hglobz3->Fill(gloZ); + hdetphi3->Fill(detPhi); + if (pid != 11 && moduleDirectionUp) + hladder3idUp->Fill(float(blade)); + } + } + + hsimHitsPerLay1->Fill(float(totalNumOfSimHits1)); + hsimHitsPerLay2->Fill(float(totalNumOfSimHits2)); + hsimHitsPerLay3->Fill(float(totalNumOfSimHits3)); + + int numberOfDetUnits1 = SimHitMap1.size(); + int numberOfDetUnits2 = SimHitMap2.size(); + int numberOfDetUnits3 = SimHitMap3.size(); + int numberOfDetUnits = numberOfDetUnits1 + numberOfDetUnits2 + numberOfDetUnits3; + + if (PRINT) + cout << " Number of full det-units = " << numberOfDetUnits << " total simhits = " << totalNumOfSimHits << endl; + + hdetsPerLay1->Fill(float(numberOfDetUnits1)); + hdetsPerLay2->Fill(float(numberOfDetUnits2)); + hdetsPerLay3->Fill(float(numberOfDetUnits3)); + + map, less >::iterator simhit_map_iterator; + for (simhit_map_iterator = SimHitMap1.begin(); simhit_map_iterator != SimHitMap1.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay1 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet1->Fill(float((simhit_map_iterator->second).size())); + } + for (simhit_map_iterator = SimHitMap2.begin(); simhit_map_iterator != SimHitMap2.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay2 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet2->Fill(float((simhit_map_iterator->second).size())); + } + for (simhit_map_iterator = SimHitMap3.begin(); simhit_map_iterator != SimHitMap3.end(); simhit_map_iterator++) { + if (PRINT) + cout << " Lay3 det = " << simhit_map_iterator->first << " simHits = " << (simhit_map_iterator->second).size() + << endl; + hsimHitsPerDet3->Fill(float((simhit_map_iterator->second).size())); + } } // ------------ method called to at the end of the job ------------ -void PixelSimHitsTestForward::endJob(){ +void PixelSimHitsTestForward::endJob() { cout << " End PixelSimHitsTestForward " << endl; hFile->Write(); hFile->Close(); -// // To get module positions -// cout<< " Module position"< diff --git a/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h b/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h index 560ee15c1ef36..0ba81a8236de3 100644 --- a/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h +++ b/Validation/RecoTrack/interface/SiStripTrackingRecHitsValid.h @@ -59,7 +59,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include "DataFormats/GeometrySurface/interface/ReferenceCounted.h" diff --git a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc index 3a8e6ea5469f6..ef0266009d6d4 100644 --- a/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc +++ b/Validation/RecoTrack/plugins/SiPixelTrackingRecHitsValid.cc @@ -31,7 +31,7 @@ #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" diff --git a/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc b/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc index 82e0a827c5e76..1500be075ae90 100644 --- a/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc +++ b/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc @@ -18,7 +18,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h" diff --git a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc index c92adeb8f9aba..64a4a8a224f98 100644 --- a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc +++ b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc @@ -12,8 +12,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" diff --git a/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h b/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h index 654423b68e75e..1fc27374f0698 100644 --- a/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h +++ b/Validation/TrackerRecHits/interface/SiStripRecHitsValid.h @@ -31,7 +31,7 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h" #include diff --git a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc index 640dc7e43f963..df3b8a54ff730 100644 --- a/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc +++ b/Validation/TrackerRecHits/src/SiPixelRecHitsValid.cc @@ -35,8 +35,8 @@ #include "Geometry/CommonTopologies/interface/PixelTopology.h" #include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h" -#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h" +#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"