From a5da7d4b8957ae6a0f122a6cdb728fd3cc2a1aa6 Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Tue, 25 Feb 2020 13:18:23 +0100 Subject: [PATCH 1/6] * renamed CondFormats/CTPPSReadoutObjects --> CondFormats/PPSObjects * renamed RecoCTPPS --> RecoPPS, and inside merged PixelLocal + TotemRPLocal to Local --- CalibPPS/ESProducers/plugins/BuildFile.xml | 2 +- .../ESProducers/plugins/CTPPSAlignmentInfo.cc | 2 +- .../plugins/CTPPSBeamParametersESSource.cc | 4 ++-- .../CTPPSBeamParametersFromLHCInfoESSource.cc | 2 +- ...PPSInterpolatedOpticalFunctionsESSource.cc | 4 ++-- .../plugins/CTPPSOpticalFunctionsESSource.cc | 2 +- .../CTPPSPixelDAQMappingESSourceXML.cc | 6 ++--- ...PSRPAlignmentCorrectionsDataESSourceXML.cc | 4 ++-- .../plugins/PPSTimingCalibrationESSource.cc | 2 +- .../plugins/PrintTotemDAQMapping.cc | 4 ++-- .../plugins/TotemDAQMappingESSourceXML.cc | 6 ++--- .../CTPPSPixelDAQMappingESSourceXML_cfi.py | 4 ++-- .../python/totemDAQMappingESSourceXML_cfi.py | 2 +- .../ESProducers/test/alignment_xml_io_test.cc | 8 +++---- .../test/ppsTimingCalibrationWriter_cfg.py | 4 ++-- .../test/print_alignment_info_XML_cfg.py | 6 ++--- .../test_totemDAQMappingESSourceXML_cfg.py | 2 +- ...nterpolatedOpticalFunctionsSetCollection.h | 13 ----------- CondFormats/CTPPSReadoutObjects/src/headers.h | 12 ---------- .../BuildFile.xml | 0 .../interface/CTPPSBeamParameters.h | 8 +++---- .../interface/CTPPSPixelAnalysisMask.h | 6 ++--- .../interface/CTPPSPixelDAQMapping.h | 8 +++---- .../interface/CTPPSPixelFramePosition.h | 4 ++-- .../interface/CTPPSPixelGainCalibration.h | 6 ++--- .../interface/CTPPSPixelGainCalibrations.h | 6 ++--- .../interface/CTPPSPixelIndices.h | 0 .../interface/CTPPSPixelROC.h | 6 ++--- .../CTPPSRPAlignmentCorrectionData.h | 4 ++-- .../CTPPSRPAlignmentCorrectionsData.h | 6 ++--- .../CTPPSRPAlignmentCorrectionsDataSequence.h | 8 +++---- .../CTPPSRPAlignmentCorrectionsMethods.h | 10 ++++----- .../LHCInterpolatedOpticalFunctionsSet.h | 6 ++--- ...nterpolatedOpticalFunctionsSetCollection.h | 13 +++++++++++ .../interface/LHCOpticalFunctionsSet.h | 4 ++-- .../LHCOpticalFunctionsSetCollection.h | 6 ++--- .../interface/PPSTimingCalibration.h | 4 ++-- .../interface/TotemAnalysisMask.h | 6 ++--- .../interface/TotemDAQMapping.h | 8 +++---- .../interface/TotemFramePosition.h | 4 ++-- .../interface/TotemSymbId.h | 4 ++-- .../python/PPSTimingDetEnum_cff.py | 0 .../src/CTPPSBeamParameters.cc | 4 ++-- .../src/CTPPSPixelAnalysisMask.cc | 2 +- .../src/CTPPSPixelDAQMapping.cc | 2 +- .../src/CTPPSPixelFramePosition.cc | 2 +- .../src/CTPPSPixelGainCalibration.cc | 2 +- .../src/CTPPSPixelGainCalibrations.cc | 2 +- .../src/CTPPSPixelROC.cc | 2 +- .../src/CTPPSRPAlignmentCorrectionData.cc | 2 +- .../src/CTPPSRPAlignmentCorrectionsData.cc | 2 +- .../src/CTPPSRPAlignmentCorrectionsMethods.cc | 2 +- .../src/LHCInterpolatedOpticalFunctionsSet.cc | 2 +- .../src/LHCOpticalFunctionsSet.cc | 2 +- .../src/PPSTimingCalibration.cc | 2 +- .../src/T_EventSetup_CTPPSBeamParameters.cc | 2 +- .../T_EventSetup_CTPPSPixelAnalysisMask.cc | 2 +- .../src/T_EventSetup_CTPPSPixelDAQMapping.cc | 2 +- .../T_EventSetup_CTPPSPixelGainCalibration.cc | 2 +- ...T_EventSetup_CTPPSPixelGainCalibrations.cc | 2 +- ...ntSetup_CTPPSRPAlignmentCorrectionsData.cc | 2 +- ...etup_LHCInterpolatedOpticalFunctionsSet.cc | 2 +- ...terpolatedOpticalFunctionsSetCollection.cc | 2 +- .../T_EventSetup_LHCOpticalFunctionsSet.cc | 2 +- ...tSetup_LHCOpticalFunctionsSetCollection.cc | 2 +- .../src/T_EventSetup_PPSTimingCalibration.cc | 2 +- .../src/TotemAnalysisMask.cc | 2 +- .../src/TotemDAQMapping.cc | 2 +- .../src/TotemFramePosition.cc | 2 +- .../src/TotemSymbId.cc | 2 +- .../src/classes.h | 2 +- .../src/classes_def.xml | 0 CondFormats/PPSObjects/src/headers.h | 12 ++++++++++ .../test/BuildFile.xml | 6 ++--- .../test/testSerializationBeamParameters.cc | 2 +- ...testSerializationLHCOpticalFunctionsSet.cc | 4 ++-- .../testSerializationPPSTimingCalibration.cc | 2 +- .../test/test_BeamParametersESSource.py | 2 +- .../xml/mapping_timing_diamond.xml | 0 .../xml/mapping_timing_diamond_2017.xml | 0 .../xml/mapping_timing_diamond_2018.xml | 0 .../xml/mapping_totem_timing_2018.xml | 0 ...ing_tracking_strip_2016_from_fill_5330.xml | 0 ...pping_tracking_strip_2016_to_fill_5288.xml | 0 .../xml/mapping_tracking_strip_2017.xml | 0 .../xml/mapping_tracking_strip_2018.xml | 0 .../xml/rpix_channel_mask_220_far.xml | 0 .../xml/rpix_mapping_2018.xml | 0 .../xml/rpix_mapping_220_far.xml | 0 .../xml/sample_alignment_corrections.xml | 0 .../xml/totem_rp_mask_example.xml | 0 .../python/Reconstruction_cff.py | 2 +- DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc | 4 ++-- .../test/all_ctpps_dqm_test_from_aod_cfg.py | 2 +- .../test/all_ctpps_dqm_test_from_dat_cfg.py | 2 +- .../test/all_ctpps_dqm_test_from_raw_cfg.py | 2 +- DQM/CTPPS/test/diamond_dqm_test_cfg.py | 8 +++---- DQM/CTPPS/test/pixel_dqm_test_cfg.py | 2 +- DQM/CTPPS/test/strip_dqm_test_cfg.py | 2 +- DQM/CTPPS/test/timing_dqm_test_cfg.py | 4 ++-- .../ctpps_dqm_sourceclient-live_cfg.py | 2 +- EventFilter/CTPPSRawToDigi/BuildFile.xml | 2 +- .../interface/CTPPSPixelDataFormatter.h | 4 ++-- .../interface/CTPPSPixelRawToDigi.h | 2 +- .../interface/CTPPSTotemDataFormatter.h | 2 +- .../CTPPSRawToDigi/interface/CounterChecker.h | 2 +- .../interface/RawToDigiConverter.h | 4 ++-- .../interface/VFATFrameCollection.h | 2 +- .../CTPPSRawToDigi/plugins/BuildFile.xml | 2 +- .../plugins/CTPPSPixelDigiToRaw.cc | 4 ++-- .../plugins/CTPPSTotemDigiToRaw.cc | 4 ++-- .../plugins/TotemVFATRawToDigi.cc | 4 ++-- .../python/ctppsRawToDigi_cff.py | 16 +++++++------- .../src/CTPPSPixelDataFormatter.cc | 2 +- .../CTPPSRawToDigi/test/ctppsPixelTest.py | 6 ++--- .../test/test_pixels_only_cfg.py | 4 ++-- .../interface/CTPPSPixelTopology.h | 2 +- .../VeryForwardGeometryBuilder/BuildFile.xml | 2 +- .../plugins/CTPPSGeometryESModule.cc | 2 +- .../src/DetGeomDesc.cc | 2 +- .../test/print_geometry_info_XML_cfg.py | 2 +- IOMC/EventVertexGenerators/BuildFile.xml | 2 +- .../Configuration/python/recoCTPPS_cff.py | 22 ------------------- RecoCTPPS/PixelLocal/plugins/BuildFile.xml | 17 -------------- RecoCTPPS/TotemRPLocal/BuildFile.xml | 16 -------------- .../python/RecoCTPPS_EventContent_cff.py | 10 ++++----- RecoPPS/Configuration/python/recoCTPPS_cff.py | 22 +++++++++++++++++++ .../Configuration/test/raw_data_test.py | 6 ++--- .../Local}/BuildFile.xml | 3 +-- .../CTPPSDiamondRecHitProducerAlgorithm.h | 6 ++--- .../interface/CTPPSDiamondTrackRecognition.h | 6 ++--- .../interface/CTPPSPixelClusterProducer.h | 12 +++++----- .../CTPPSPixelGainCalibrationDBService.h | 10 ++++----- .../interface/CTPPSPixelRecHitProducer.h | 6 ++--- .../interface/CTPPSTimingTrackRecognition.h | 4 ++-- .../Local}/interface/FastLineRecognition.h | 4 ++-- .../Local}/interface/RPixClusterToHit.h | 4 ++-- .../Local}/interface/RPixDetClusterizer.h | 10 ++++----- .../Local}/interface/RPixDetPatternFinder.h | 4 ++-- .../Local}/interface/RPixDetTrackFinder.h | 6 ++--- .../interface/RPixPlaneCombinatoryTracking.h | 6 ++--- .../Local}/interface/RPixRoadFinder.h | 8 +++---- .../TotemRPClusterProducerAlgorithm.h | 4 ++-- .../TotemRPLocalTrackFitterAlgorithm.h | 4 ++-- .../TotemRPRecHitProducerAlgorithm.h | 4 ++-- .../Local}/interface/TotemTimingConversions.h | 6 ++--- .../TotemTimingRecHitProducerAlgorithm.h | 8 +++---- .../interface/TotemTimingTrackRecognition.h | 6 ++--- .../Local}/plugins/BuildFile.xml | 12 +++++----- .../plugins/CTPPSDiamondLocalTrackFitter.cc | 2 +- .../plugins/CTPPSDiamondRecHitProducer.cc | 2 +- .../plugins/CTPPSLocalTrackLiteProducer.cc | 2 +- .../plugins/CTPPSPixelClusterProducer.cc | 2 +- .../plugins/CTPPSPixelLocalTrackProducer.cc | 8 +++---- .../plugins/CTPPSPixelRecHitProducer.cc | 2 +- .../Local}/plugins/TotemRPClusterProducer.cc | 2 +- .../Local}/plugins/TotemRPLocalTrackFitter.cc | 2 +- .../Local}/plugins/TotemRPRecHitProducer.cc | 2 +- .../Local}/plugins/TotemRPUVPatternFinder.cc | 2 +- .../plugins/TotemTimingLocalTrackFitter.cc | 2 +- .../plugins/TotemTimingRecHitProducer.cc | 2 +- .../PPSTimingCalibrationModeEnum_cff.py | 0 .../ctppsDiamondLocalReconstruction_cff.py | 4 ++-- .../python/ctppsLocalTrackLiteProducer_cff.py | 2 +- .../ctppsPixelLocalReconstruction_cff.py | 6 ++--- .../python/totemRPLocalReconstruction_cff.py | 8 +++---- .../totemTimingLocalReconstruction_cff.py | 4 ++-- .../CTPPSDiamondRecHitProducerAlgorithm.cc | 2 +- .../src/CTPPSDiamondTrackRecognition.cc | 2 +- .../src/CTPPSPixelGainCalibrationDBService.cc | 6 ++--- .../Local}/src/FastLineRecognition.cc | 2 +- .../Local}/src/RPixClusterToHit.cc | 2 +- .../Local}/src/RPixDetClusterizer.cc | 2 +- .../src/RPixPlaneCombinatoryTracking.cc | 4 ++-- .../Local}/src/RPixRoadFinder.cc | 2 +- .../src/TotemRPClusterProducerAlgorithm.cc | 2 +- .../src/TotemRPLocalTrackFitterAlgorithm.cc | 2 +- .../src/TotemRPRecHitProducerAlgorithm.cc | 2 +- .../Local}/src/TotemTimingConversions.cc | 2 +- .../src/TotemTimingRecHitProducerAlgorithm.cc | 2 +- .../Local}/src/TotemTimingTrackRecognition.cc | 2 +- .../Local}/test/_aa_real_ALL_GT_2.py | 6 ++--- .../Local}/test/diamonds_reco_cfg.py | 12 +++++----- .../run_only_CTPPS_cfg_CLU_DB_real_mem.py | 2 +- .../run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py | 6 ++--- .../run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py | 2 +- ...nly_CTPPS_cfg_CLU_REC_mem_testDB_300811.py | 4 ++-- .../Local}/test/totemTiming_reco_cfg.py | 8 +++---- .../ProtonReconstruction/BuildFile.xml | 3 +-- .../interface/ProtonReconstructionAlgorithm.h | 8 +++---- .../plugins/BuildFile.xml | 2 +- .../plugins/CTPPSProtonProducer.cc | 4 ++-- .../python/ctppsProtons_cff.py | 2 +- .../src/ProtonReconstructionAlgorithm.cc | 2 +- Validation/CTPPS/plugins/BuildFile.xml | 2 +- .../plugins/CTPPSDirectProtonSimulation.cc | 4 ++-- .../CTPPSModifiedOpticalFunctionsESSource.cc | 2 +- .../CTPPS/plugins/CTPPSOpticsPlotter.cc | 2 +- .../CTPPSProtonReconstructionValidator.cc | 2 +- .../CTPPS/python/simu_config/base_cff.py | 8 +++---- 200 files changed, 384 insertions(+), 417 deletions(-) delete mode 100644 CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h delete mode 100644 CondFormats/CTPPSReadoutObjects/src/headers.h rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/BuildFile.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSBeamParameters.h (95%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelAnalysisMask.h (81%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelDAQMapping.h (79%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelFramePosition.h (96%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelGainCalibration.h (95%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelGainCalibrations.h (81%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelIndices.h (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSPixelROC.h (94%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSRPAlignmentCorrectionData.h (97%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSRPAlignmentCorrectionsData.h (93%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSRPAlignmentCorrectionsDataSequence.h (70%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/CTPPSRPAlignmentCorrectionsMethods.h (87%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/LHCInterpolatedOpticalFunctionsSet.h (86%) create mode 100644 CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/LHCOpticalFunctionsSet.h (90%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/LHCOpticalFunctionsSetCollection.h (67%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/PPSTimingCalibration.h (92%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/TotemAnalysisMask.h (85%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/TotemDAQMapping.h (85%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/TotemFramePosition.h (97%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/interface/TotemSymbId.h (87%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/python/PPSTimingDetEnum_cff.py (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSBeamParameters.cc (98%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelAnalysisMask.cc (80%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelDAQMapping.cc (94%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelFramePosition.cc (95%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelGainCalibration.cc (98%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelGainCalibrations.cc (97%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSPixelROC.cc (62%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSRPAlignmentCorrectionData.cc (97%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSRPAlignmentCorrectionsData.cc (98%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/CTPPSRPAlignmentCorrectionsMethods.cc (99%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/LHCInterpolatedOpticalFunctionsSet.cc (95%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/LHCOpticalFunctionsSet.cc (96%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/PPSTimingCalibration.cc (96%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSBeamParameters.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSPixelAnalysisMask.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSPixelDAQMapping.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSPixelGainCalibration.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSPixelGainCalibrations.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc (54%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc (54%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc (54%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_LHCOpticalFunctionsSet.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc (54%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/T_EventSetup_PPSTimingCalibration.cc (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/TotemAnalysisMask.cc (90%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/TotemDAQMapping.cc (95%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/TotemFramePosition.cc (96%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/TotemSymbId.cc (87%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/classes.h (94%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/src/classes_def.xml (100%) create mode 100644 CondFormats/PPSObjects/src/headers.h rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/test/BuildFile.xml (55%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/test/testSerializationBeamParameters.cc (69%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/test/testSerializationLHCOpticalFunctionsSet.cc (52%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/test/testSerializationPPSTimingCalibration.cc (75%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/test/test_BeamParametersESSource.py (96%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_timing_diamond.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_timing_diamond_2017.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_timing_diamond_2018.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_totem_timing_2018.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_tracking_strip_2016_from_fill_5330.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_tracking_strip_2016_to_fill_5288.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_tracking_strip_2017.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/mapping_tracking_strip_2018.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/rpix_channel_mask_220_far.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/rpix_mapping_2018.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/rpix_mapping_220_far.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/sample_alignment_corrections.xml (100%) rename CondFormats/{CTPPSReadoutObjects => PPSObjects}/xml/totem_rp_mask_example.xml (100%) delete mode 100644 RecoCTPPS/Configuration/python/recoCTPPS_cff.py delete mode 100644 RecoCTPPS/PixelLocal/plugins/BuildFile.xml delete mode 100644 RecoCTPPS/TotemRPLocal/BuildFile.xml rename {RecoCTPPS => RecoPPS}/Configuration/python/RecoCTPPS_EventContent_cff.py (89%) create mode 100644 RecoPPS/Configuration/python/recoCTPPS_cff.py rename {RecoCTPPS => RecoPPS}/Configuration/test/raw_data_test.py (90%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/BuildFile.xml (79%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/CTPPSDiamondRecHitProducerAlgorithm.h (86%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/CTPPSDiamondTrackRecognition.h (86%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/CTPPSPixelClusterProducer.h (83%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/CTPPSPixelGainCalibrationDBService.h (74%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/CTPPSPixelRecHitProducer.h (90%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/CTPPSTimingTrackRecognition.h (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/FastLineRecognition.h (96%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixClusterToHit.h (90%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixDetClusterizer.h (88%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixDetPatternFinder.h (93%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixDetTrackFinder.h (90%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixPlaneCombinatoryTracking.h (93%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/interface/RPixRoadFinder.h (87%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemRPClusterProducerAlgorithm.h (88%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemRPLocalTrackFitterAlgorithm.h (95%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemRPRecHitProducerAlgorithm.h (87%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemTimingConversions.h (88%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemTimingRecHitProducerAlgorithm.h (87%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/interface/TotemTimingTrackRecognition.h (86%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/BuildFile.xml (74%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/CTPPSDiamondLocalTrackFitter.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/CTPPSDiamondRecHitProducer.cc (97%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/CTPPSLocalTrackLiteProducer.cc (99%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/plugins/CTPPSPixelClusterProducer.cc (97%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/plugins/CTPPSPixelLocalTrackProducer.cc (97%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/plugins/CTPPSPixelRecHitProducer.cc (95%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemRPClusterProducer.cc (97%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemRPLocalTrackFitter.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemRPRecHitProducer.cc (97%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemRPUVPatternFinder.cc (99%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemTimingLocalTrackFitter.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/plugins/TotemTimingRecHitProducer.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/python/PPSTimingCalibrationModeEnum_cff.py (100%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/python/ctppsDiamondLocalReconstruction_cff.py (62%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/python/ctppsLocalTrackLiteProducer_cff.py (82%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/python/ctppsPixelLocalReconstruction_cff.py (56%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/python/totemRPLocalReconstruction_cff.py (59%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/python/totemTimingLocalReconstruction_cff.py (62%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/CTPPSDiamondRecHitProducerAlgorithm.cc (97%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/CTPPSDiamondTrackRecognition.cc (98%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/src/CTPPSPixelGainCalibrationDBService.cc (86%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/FastLineRecognition.cc (99%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/src/RPixClusterToHit.cc (98%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/src/RPixDetClusterizer.cc (99%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/src/RPixPlaneCombinatoryTracking.cc (99%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/src/RPixRoadFinder.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemRPClusterProducerAlgorithm.cc (96%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemRPLocalTrackFitterAlgorithm.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemRPRecHitProducerAlgorithm.cc (91%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemTimingConversions.cc (98%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemTimingRecHitProducerAlgorithm.cc (99%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/src/TotemTimingTrackRecognition.cc (98%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/test/_aa_real_ALL_GT_2.py (96%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/test/diamonds_reco_cfg.py (86%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py (97%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py (94%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py (97%) rename {RecoCTPPS/PixelLocal => RecoPPS/Local}/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py (95%) rename {RecoCTPPS/TotemRPLocal => RecoPPS/Local}/test/totemTiming_reco_cfg.py (87%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/BuildFile.xml (83%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h (90%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/plugins/BuildFile.xml (83%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/plugins/CTPPSProtonProducer.cc (99%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/python/ctppsProtons_cff.py (96%) rename {RecoCTPPS => RecoPPS}/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc (99%) diff --git a/CalibPPS/ESProducers/plugins/BuildFile.xml b/CalibPPS/ESProducers/plugins/BuildFile.xml index 80883d82f61b6..295f6d491db3d 100644 --- a/CalibPPS/ESProducers/plugins/BuildFile.xml +++ b/CalibPPS/ESProducers/plugins/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/CalibPPS/ESProducers/plugins/CTPPSAlignmentInfo.cc b/CalibPPS/ESProducers/plugins/CTPPSAlignmentInfo.cc index 73d5d08608db6..0b3ad4f13bf51 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSAlignmentInfo.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSAlignmentInfo.cc @@ -17,7 +17,7 @@ #include "CondFormats/AlignmentRecord/interface/RPRealAlignmentRecord.h" #include "CondFormats/AlignmentRecord/interface/RPMisalignedAlignmentRecord.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" //---------------------------------------------------------------------------------------------------- diff --git a/CalibPPS/ESProducers/plugins/CTPPSBeamParametersESSource.cc b/CalibPPS/ESProducers/plugins/CTPPSBeamParametersESSource.cc index fa17f498b37e9..8a5c75e4f93e4 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSBeamParametersESSource.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSBeamParametersESSource.cc @@ -1,6 +1,6 @@ /**************************************************************************** * - * CondFormats/CTPPSReadoutObjects/plugins/CTPPSBeamParametersESSource.cc + * CondFormats/PPSObjects/plugins/CTPPSBeamParametersESSource.cc * * Description : - Loads CTPPSBeamParameters from the CTPPSBeamParametersESSource_cfi.py * config file. @@ -26,7 +26,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" #include diff --git a/CalibPPS/ESProducers/plugins/CTPPSBeamParametersFromLHCInfoESSource.cc b/CalibPPS/ESProducers/plugins/CTPPSBeamParametersFromLHCInfoESSource.cc index 7a02ade9d9efb..cda10503aa560 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSBeamParametersFromLHCInfoESSource.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSBeamParametersFromLHCInfoESSource.cc @@ -18,7 +18,7 @@ #include "CondFormats/RunInfo/interface/LHCInfo.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" //---------------------------------------------------------------------------------------------------- diff --git a/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc b/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc index 1bb3c012ad4c5..ef4f738eeb2ff 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc @@ -13,8 +13,8 @@ #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" #include "CondFormats/RunInfo/interface/LHCInfo.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" class CTPPSInterpolatedOpticalFunctionsESSource : public edm::ESProducer { public: diff --git a/CalibPPS/ESProducers/plugins/CTPPSOpticalFunctionsESSource.cc b/CalibPPS/ESProducers/plugins/CTPPSOpticalFunctionsESSource.cc index 3acaaa7d79a35..fe93fe290b5ff 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSOpticalFunctionsESSource.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSOpticalFunctionsESSource.cc @@ -7,7 +7,7 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" #include "CondFormats/DataRecord/interface/CTPPSOpticsRcd.h" //---------------------------------------------------------------------------------------------------- diff --git a/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc index 6e87f0c71c193..cb0e75909333a 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc @@ -23,9 +23,9 @@ #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h" #include "Utilities/Xerces/interface/XercesStrUtils.h" #include diff --git a/CalibPPS/ESProducers/plugins/CTPPSRPAlignmentCorrectionsDataESSourceXML.cc b/CalibPPS/ESProducers/plugins/CTPPSRPAlignmentCorrectionsDataESSourceXML.cc index bd8bf428b1617..1f870f5d65ffa 100644 --- a/CalibPPS/ESProducers/plugins/CTPPSRPAlignmentCorrectionsDataESSourceXML.cc +++ b/CalibPPS/ESProducers/plugins/CTPPSRPAlignmentCorrectionsDataESSourceXML.cc @@ -16,9 +16,9 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/FileInPath.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" #include "CondFormats/AlignmentRecord/interface/CTPPSRPAlignmentCorrectionsDataRcd.h" // this used to be RPMeasuredAlignmentRecord.h #include "CondFormats/AlignmentRecord/interface/RPRealAlignmentRecord.h" diff --git a/CalibPPS/ESProducers/plugins/PPSTimingCalibrationESSource.cc b/CalibPPS/ESProducers/plugins/PPSTimingCalibrationESSource.cc index bfbc92031e700..4b9e034dbaee1 100644 --- a/CalibPPS/ESProducers/plugins/PPSTimingCalibrationESSource.cc +++ b/CalibPPS/ESProducers/plugins/PPSTimingCalibrationESSource.cc @@ -21,7 +21,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include "CondFormats/DataRecord/interface/PPSTimingCalibrationRcd.h" #include diff --git a/CalibPPS/ESProducers/plugins/PrintTotemDAQMapping.cc b/CalibPPS/ESProducers/plugins/PrintTotemDAQMapping.cc index bbfd8cdbcff0d..415bc4480bfc0 100644 --- a/CalibPPS/ESProducers/plugins/PrintTotemDAQMapping.cc +++ b/CalibPPS/ESProducers/plugins/PrintTotemDAQMapping.cc @@ -14,8 +14,8 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "CondFormats/DataRecord/interface/TotemReadoutRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" //---------------------------------------------------------------------------------------------------- diff --git a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc index 4ca27aaddb58e..34cb19316f68d 100644 --- a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc +++ b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc @@ -25,9 +25,9 @@ #include "DataFormats/CTPPSDetId/interface/TotemTimingDetId.h" #include "CondFormats/DataRecord/interface/TotemReadoutRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" #include "Utilities/Xerces/interface/XercesStrUtils.h" #include diff --git a/CalibPPS/ESProducers/python/CTPPSPixelDAQMappingESSourceXML_cfi.py b/CalibPPS/ESProducers/python/CTPPSPixelDAQMappingESSourceXML_cfi.py index 3a177f5055b8d..a0a52ef2669a4 100644 --- a/CalibPPS/ESProducers/python/CTPPSPixelDAQMappingESSourceXML_cfi.py +++ b/CalibPPS/ESProducers/python/CTPPSPixelDAQMappingESSourceXML_cfi.py @@ -7,8 +7,8 @@ # example configuration block: cms.PSet( validityRange = cms.EventRange("1:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_220_far.xml"), - maskFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_channel_mask_220_far.xml") + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_mapping_220_far.xml"), + maskFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_channel_mask_220_far.xml") ) ) ) diff --git a/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py b/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py index 1804c5d2e7bb4..db425a1a7e347 100644 --- a/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py +++ b/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py @@ -10,7 +10,7 @@ # example configuration block: #cms.PSet( # validityRange = cms.EventRange("1:min - 999999999:max"), - # mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/ctpps_mapping_to_fill_5288.xml"), + # mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/ctpps_mapping_to_fill_5288.xml"), # maskFileNames = cms.vstring() #) ) diff --git a/CalibPPS/ESProducers/test/alignment_xml_io_test.cc b/CalibPPS/ESProducers/test/alignment_xml_io_test.cc index c2faa351987be..ce9fca62ab516 100644 --- a/CalibPPS/ESProducers/test/alignment_xml_io_test.cc +++ b/CalibPPS/ESProducers/test/alignment_xml_io_test.cc @@ -1,7 +1,7 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h" @@ -97,4 +97,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/CalibPPS/ESProducers/test/ppsTimingCalibrationWriter_cfg.py b/CalibPPS/ESProducers/test/ppsTimingCalibrationWriter_cfg.py index 0eb07d507857e..52ea36d567bf8 100644 --- a/CalibPPS/ESProducers/test/ppsTimingCalibrationWriter_cfg.py +++ b/CalibPPS/ESProducers/test/ppsTimingCalibrationWriter_cfg.py @@ -9,11 +9,11 @@ interval = cms.uint64(1) ) -from CondFormats.CTPPSReadoutObjects.PPSTimingDetEnum_cff import PPSTimingDetEnum +from CondFormats.PPSObjects.PPSTimingDetEnum_cff import PPSTimingDetEnum # load calibrations from JSON file process.load('CalibPPS.ESProducers.ppsTimingCalibrationESSource_cfi') -process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoCTPPS/TotemRPLocal/data/timing_calibration_diamond_2018_mar19.ex.json') +process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoPPS/Local/data/timing_calibration_diamond_2018_mar19.ex.json') process.ppsTimingCalibrationESSource.subDetector = PPSTimingDetEnum.PPS_DIAMOND # output service for database diff --git a/CalibPPS/ESProducers/test/print_alignment_info_XML_cfg.py b/CalibPPS/ESProducers/test/print_alignment_info_XML_cfg.py index 064ab1ff60f2b..554d1b81542a9 100644 --- a/CalibPPS/ESProducers/test/print_alignment_info_XML_cfg.py +++ b/CalibPPS/ESProducers/test/print_alignment_info_XML_cfg.py @@ -12,9 +12,9 @@ # load alignment corrections process.load("CalibPPS.ESProducers.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") # no events to process process.source = cms.Source("EmptySource") diff --git a/CalibPPS/ESProducers/test/test_totemDAQMappingESSourceXML_cfg.py b/CalibPPS/ESProducers/test/test_totemDAQMappingESSourceXML_cfg.py index f86b3ad208a02..2ae99c3cadf9c 100644 --- a/CalibPPS/ESProducers/test/test_totemDAQMappingESSourceXML_cfg.py +++ b/CalibPPS/ESProducers/test/test_totemDAQMappingESSourceXML_cfg.py @@ -25,7 +25,7 @@ process.totemDAQMappingESSourceXML.configuration = cms.VPSet( cms.PSet( validityRange = cms.EventRange("1:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2017.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2017.xml"), maskFileNames = cms.vstring() ) ) diff --git a/CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h b/CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h deleted file mode 100644 index e00109d9e923c..0000000000000 --- a/CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h +++ /dev/null @@ -1,13 +0,0 @@ -// Original Author: Jan Kašpar - -#ifndef CondFormats_CTPPSReadoutObjects_LHCInterpolatedOpticalFunctionsSetCollection_h -#define CondFormats_CTPPSReadoutObjects_LHCInterpolatedOpticalFunctionsSetCollection_h - -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" - -#include - -class LHCInterpolatedOpticalFunctionsSetCollection - : public std::unordered_map {}; - -#endif diff --git a/CondFormats/CTPPSReadoutObjects/src/headers.h b/CondFormats/CTPPSReadoutObjects/src/headers.h deleted file mode 100644 index 2b74cd572dc5f..0000000000000 --- a/CondFormats/CTPPSReadoutObjects/src/headers.h +++ /dev/null @@ -1,12 +0,0 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" - -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" diff --git a/CondFormats/CTPPSReadoutObjects/BuildFile.xml b/CondFormats/PPSObjects/BuildFile.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/BuildFile.xml rename to CondFormats/PPSObjects/BuildFile.xml diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h b/CondFormats/PPSObjects/interface/CTPPSBeamParameters.h similarity index 95% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h rename to CondFormats/PPSObjects/interface/CTPPSBeamParameters.h index ed4c952be037a..6975b7eb21484 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h +++ b/CondFormats/PPSObjects/interface/CTPPSBeamParameters.h @@ -1,8 +1,8 @@ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSBeamParameters_h -#define CondFormats_CTPPSReadoutObjects_CTPPSBeamParameters_h +#ifndef CondFormats_PPSObjects_CTPPSBeamParameters_h +#define CondFormats_PPSObjects_CTPPSBeamParameters_h // -*- C++ -*- // -// Package: CTPPSReadoutObjects +// Package: PPSObjects // Class: CTPPSBeamParameters // /**\class CTPPSBeamParameters CTPPSBeamParameters.h CondFormats/CTPPSRedoutObjects/src/CTPPSBeamParameters.cc @@ -120,4 +120,4 @@ class CTPPSBeamParameters { std::ostream &operator<<(std::ostream &, CTPPSBeamParameters); -#endif \ No newline at end of file +#endif diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h b/CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h similarity index 81% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h rename to CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h index 7f73b8cd76502..ee6a1d096ccf1 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h @@ -4,14 +4,14 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelAnalysisMask -#define CondFormats_CTPPSReadoutObjects_CTPPSPixelAnalysisMask +#ifndef CondFormats_PPSObjects_CTPPSPixelAnalysisMask +#define CondFormats_PPSObjects_CTPPSPixelAnalysisMask #include #include #include "CondFormats/Serialization/interface/Serializable.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" /** *\brief Contains data on masked channels of a ROC diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h b/CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h similarity index 79% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h rename to CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h index 58d2b4141d3c1..e54172a2a737d 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h @@ -6,12 +6,12 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelDAQMapping -#define CondFormats_CTPPSReadoutObjects_CTPPSPixelDAQMapping +#ifndef CondFormats_PPSObjects_CTPPSPixelDAQMapping +#define CondFormats_PPSObjects_CTPPSPixelDAQMapping #include "CondFormats/Serialization/interface/Serializable.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h b/CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h similarity index 96% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h rename to CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h index f4a6c370a5216..c8e9ea03c022c 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelFramePosition -#define CondFormats_CTPPSReadoutObjects_CTPPSPixelFramePosition +#ifndef CondFormats_PPSObjects_CTPPSPixelFramePosition +#define CondFormats_PPSObjects_CTPPSPixelFramePosition #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h b/CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h similarity index 95% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h rename to CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h index da52887b190c8..3fd540b8057a3 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h @@ -1,8 +1,8 @@ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelGainCalibration_h -#define CondFormats_CTPPSReadoutObjects_CTPPSPixelGainCalibration_h +#ifndef CondFormats_PPSObjects_CTPPSPixelGainCalibration_h +#define CondFormats_PPSObjects_CTPPSPixelGainCalibration_h // -*- C++ -*- // -// Package: CTPPSReadoutObjects +// Package: PPSObjects // Class: CTPPSPixelGainCalibration // /**\class CTPPSPixelGainCalibration CTPPSPixelGainCalibration.h CondFormats/CTPPSRedoutObjects/src/CTPPSPixelGainCalibration.cc diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h b/CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h similarity index 81% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h rename to CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h index 265e288c28335..d202a37554c26 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h @@ -1,7 +1,7 @@ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelGainCalibrations_h -#define CondFormats_CTPPSReadoutObjects_CTPPSPixelGainCalibrations_h +#ifndef CondFormats_PPSObjects_CTPPSPixelGainCalibrations_h +#define CondFormats_PPSObjects_CTPPSPixelGainCalibrations_h -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h b/CondFormats/PPSObjects/interface/CTPPSPixelIndices.h similarity index 100% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h rename to CondFormats/PPSObjects/interface/CTPPSPixelIndices.h diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelROC.h b/CondFormats/PPSObjects/interface/CTPPSPixelROC.h similarity index 94% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelROC.h rename to CondFormats/PPSObjects/interface/CTPPSPixelROC.h index ae3f17f7779ea..5db189c525a48 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelROC.h +++ b/CondFormats/PPSObjects/interface/CTPPSPixelROC.h @@ -1,9 +1,9 @@ -#ifndef CTPPSReadoutObjects_PixelROC_H -#define CTPPSReadoutObjects_PixelROC_H +#ifndef PPSObjects_PixelROC_H +#define PPSObjects_PixelROC_H #include "CondFormats/Serialization/interface/Serializable.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h similarity index 97% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h rename to CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h index a42f16e8ca2fa..42000b087e343 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h +++ b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionData -#define CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionData +#ifndef CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionData +#define CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionData #include "CondFormats/Serialization/interface/Serializable.h" diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h similarity index 93% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h rename to CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h index c396ee03a884c..dca4921b71c77 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h +++ b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h @@ -8,10 +8,10 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsData -#define CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsData +#ifndef CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsData +#define CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsData -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h similarity index 70% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h rename to CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h index 21b33013e2b08..67f114de6ee0e 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h +++ b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h @@ -6,19 +6,19 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsDataSequence -#define CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsDataSequence +#ifndef CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsDataSequence +#define CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsDataSequence #include #include "FWCore/Framework/interface/ValidityInterval.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" /** *\brief Time sequence of alignment corrections. * I/O methods have been factored out to: - * CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h + * CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h */ class CTPPSRPAlignmentCorrectionsDataSequence : public std::vector > { diff --git a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h similarity index 87% rename from CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h rename to CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h index c836a7686d2f5..0927d99a70bcd 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h +++ b/CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h @@ -8,12 +8,12 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsMethods -#define CondFormats_CTPPSReadoutObjects_CTPPSRPAlignmentCorrectionsMethods +#ifndef CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsMethods +#define CondFormats_PPSObjects_CTPPSRPAlignmentCorrectionsMethods -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h b/CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h similarity index 86% rename from CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h rename to CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h index 589d748ac60c4..291d8c2a239c1 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h +++ b/CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h @@ -1,9 +1,9 @@ // Original Author: Jan Kašpar -#ifndef CondFormats_CTPPSReadoutObjects_LHCInterpolatedOpticalFunctionsSet_h -#define CondFormats_CTPPSReadoutObjects_LHCInterpolatedOpticalFunctionsSet_h +#ifndef CondFormats_PPSObjects_LHCInterpolatedOpticalFunctionsSet_h +#define CondFormats_PPSObjects_LHCInterpolatedOpticalFunctionsSet_h -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" #include "TSpline.h" diff --git a/CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h b/CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h new file mode 100644 index 0000000000000..cff547e5fe26b --- /dev/null +++ b/CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h @@ -0,0 +1,13 @@ +// Original Author: Jan Kašpar + +#ifndef CondFormats_PPSObjects_LHCInterpolatedOpticalFunctionsSetCollection_h +#define CondFormats_PPSObjects_LHCInterpolatedOpticalFunctionsSetCollection_h + +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" + +#include + +class LHCInterpolatedOpticalFunctionsSetCollection + : public std::unordered_map {}; + +#endif diff --git a/CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h b/CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h similarity index 90% rename from CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h rename to CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h index e75098c425cd2..fa91daaa8cef2 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h +++ b/CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h @@ -1,7 +1,7 @@ // Original Author: Jan Kašpar -#ifndef CondFormats_CTPPSReadoutObjects_LHCOpticalFunctionsSet_h -#define CondFormats_CTPPSReadoutObjects_LHCOpticalFunctionsSet_h +#ifndef CondFormats_PPSObjects_LHCOpticalFunctionsSet_h +#define CondFormats_PPSObjects_LHCOpticalFunctionsSet_h #include "CondFormats/Serialization/interface/Serializable.h" diff --git a/CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h b/CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h similarity index 67% rename from CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h rename to CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h index dbbacc984b3c5..e79293376f0b5 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h +++ b/CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h @@ -1,10 +1,10 @@ // Original Author: Jan Kašpar -#ifndef CondFormats_CTPPSReadoutObjects_LHCOpticalFunctionsSetCollection_h -#define CondFormats_CTPPSReadoutObjects_LHCOpticalFunctionsSetCollection_h +#ifndef CondFormats_PPSObjects_LHCOpticalFunctionsSetCollection_h +#define CondFormats_PPSObjects_LHCOpticalFunctionsSetCollection_h #include "CondFormats/Serialization/interface/Serializable.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h b/CondFormats/PPSObjects/interface/PPSTimingCalibration.h similarity index 92% rename from CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h rename to CondFormats/PPSObjects/interface/PPSTimingCalibration.h index a2f4904a98ec6..d8d21f58ae69b 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h +++ b/CondFormats/PPSObjects/interface/PPSTimingCalibration.h @@ -7,8 +7,8 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_PPSTimingCalibration_h -#define CondFormats_CTPPSReadoutObjects_PPSTimingCalibration_h +#ifndef CondFormats_PPSObjects_PPSTimingCalibration_h +#define CondFormats_PPSObjects_PPSTimingCalibration_h #include "CondFormats/Serialization/interface/Serializable.h" diff --git a/CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h b/CondFormats/PPSObjects/interface/TotemAnalysisMask.h similarity index 85% rename from CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h rename to CondFormats/PPSObjects/interface/TotemAnalysisMask.h index fb8f1a2125139..8a0cf7963fbf3 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h +++ b/CondFormats/PPSObjects/interface/TotemAnalysisMask.h @@ -7,10 +7,10 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_TotemAnalysisMask -#define CondFormats_CTPPSReadoutObjects_TotemAnalysisMask +#ifndef CondFormats_PPSObjects_TotemAnalysisMask +#define CondFormats_PPSObjects_TotemAnalysisMask -#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h" +#include "CondFormats/PPSObjects/interface/TotemSymbId.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h b/CondFormats/PPSObjects/interface/TotemDAQMapping.h similarity index 85% rename from CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h rename to CondFormats/PPSObjects/interface/TotemDAQMapping.h index 54eb19f9084f0..aac938a7daeb6 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h +++ b/CondFormats/PPSObjects/interface/TotemDAQMapping.h @@ -7,12 +7,12 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_TotemDAQMapping -#define CondFormats_CTPPSReadoutObjects_TotemDAQMapping +#ifndef CondFormats_PPSObjects_TotemDAQMapping +#define CondFormats_PPSObjects_TotemDAQMapping -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h" +#include "CondFormats/PPSObjects/interface/TotemSymbId.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h b/CondFormats/PPSObjects/interface/TotemFramePosition.h similarity index 97% rename from CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h rename to CondFormats/PPSObjects/interface/TotemFramePosition.h index 7e5be46a48946..6a31691f4becd 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h +++ b/CondFormats/PPSObjects/interface/TotemFramePosition.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_TotemFramePosition -#define CondFormats_CTPPSReadoutObjects_TotemFramePosition +#ifndef CondFormats_PPSObjects_TotemFramePosition +#define CondFormats_PPSObjects_TotemFramePosition #include #include diff --git a/CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h b/CondFormats/PPSObjects/interface/TotemSymbId.h similarity index 87% rename from CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h rename to CondFormats/PPSObjects/interface/TotemSymbId.h index b3b06930f4bb1..4fc8a29ec3f91 100644 --- a/CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h +++ b/CondFormats/PPSObjects/interface/TotemSymbId.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef CondFormats_CTPPSReadoutObjects_TotemSymbId -#define CondFormats_CTPPSReadoutObjects_TotemSymbId +#ifndef CondFormats_PPSObjects_TotemSymbId +#define CondFormats_PPSObjects_TotemSymbId #include diff --git a/CondFormats/CTPPSReadoutObjects/python/PPSTimingDetEnum_cff.py b/CondFormats/PPSObjects/python/PPSTimingDetEnum_cff.py similarity index 100% rename from CondFormats/CTPPSReadoutObjects/python/PPSTimingDetEnum_cff.py rename to CondFormats/PPSObjects/python/PPSTimingDetEnum_cff.py diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSBeamParameters.cc b/CondFormats/PPSObjects/src/CTPPSBeamParameters.cc similarity index 98% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSBeamParameters.cc rename to CondFormats/PPSObjects/src/CTPPSBeamParameters.cc index 620d828d0c295..f4ef8916c932a 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSBeamParameters.cc +++ b/CondFormats/PPSObjects/src/CTPPSBeamParameters.cc @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Package: CTPPSReadoutObjects +// Package: PPSObjects // Class: CTPPSBeamParameters // /**\class CTPPSBeamParameters CTPPSBeamParameters.h CondFormats/CTPPSRedoutObjects/src/CTPPSBeamParameters.cc @@ -14,7 +14,7 @@ // Created: 20 Nov 2018 // -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include // Constructors diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelAnalysisMask.cc b/CondFormats/PPSObjects/src/CTPPSPixelAnalysisMask.cc similarity index 80% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelAnalysisMask.cc rename to CondFormats/PPSObjects/src/CTPPSPixelAnalysisMask.cc index 7dec2e2da11fc..8c2592ec63fa1 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelAnalysisMask.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelAnalysisMask.cc @@ -4,7 +4,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" void CTPPSPixelAnalysisMask::insert(const uint32_t &sid, const CTPPSPixelROCAnalysisMask &am) { analysisMask[sid] = am; diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelDAQMapping.cc b/CondFormats/PPSObjects/src/CTPPSPixelDAQMapping.cc similarity index 94% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelDAQMapping.cc rename to CondFormats/PPSObjects/src/CTPPSPixelDAQMapping.cc index 14a1f04cf5c17..1adc8fdafc918 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelDAQMapping.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelDAQMapping.cc @@ -8,7 +8,7 @@ #include "FWCore/Utilities/interface/typelookup.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" using namespace std; diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelFramePosition.cc b/CondFormats/PPSObjects/src/CTPPSPixelFramePosition.cc similarity index 95% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelFramePosition.cc rename to CondFormats/PPSObjects/src/CTPPSPixelFramePosition.cc index d02cd2b62436e..57242a8a30e26 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelFramePosition.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelFramePosition.cc @@ -6,7 +6,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibration.cc b/CondFormats/PPSObjects/src/CTPPSPixelGainCalibration.cc similarity index 98% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibration.cc rename to CondFormats/PPSObjects/src/CTPPSPixelGainCalibration.cc index 09c0920955233..471a83d84bc9e 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibration.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelGainCalibration.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h" #include "FWCore/Utilities/interface/Exception.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibrations.cc b/CondFormats/PPSObjects/src/CTPPSPixelGainCalibrations.cc similarity index 97% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibrations.cc rename to CondFormats/PPSObjects/src/CTPPSPixelGainCalibrations.cc index 74374c9363609..c1ca99796a43e 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelGainCalibrations.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelGainCalibrations.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelROC.cc b/CondFormats/PPSObjects/src/CTPPSPixelROC.cc similarity index 62% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSPixelROC.cc rename to CondFormats/PPSObjects/src/CTPPSPixelROC.cc index 9c2cc23588f53..66833ebfe3d71 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSPixelROC.cc +++ b/CondFormats/PPSObjects/src/CTPPSPixelROC.cc @@ -1,3 +1,3 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelROC.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelROC.h" CTPPSPixelROC::CTPPSPixelROC(uint32_t du, int idDU, int idLk) : theDetUnit(du), theIdDU(idDU), theIdLk(idLk) {} diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionData.cc b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionData.cc similarity index 97% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionData.cc rename to CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionData.cc index 0b0f953751e53..cfd19f19c1c66 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionData.cc +++ b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionData.cc @@ -10,7 +10,7 @@ #include "FWCore/Utilities/interface/Exception.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsData.cc b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsData.cc similarity index 98% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsData.cc rename to CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsData.cc index 55f46bcc69f35..df3c203ba6e02 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsData.cc +++ b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsData.cc @@ -8,7 +8,7 @@ #include "FWCore/Utilities/interface/typelookup.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" #include diff --git a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc similarity index 99% rename from CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc rename to CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc index bc43bc66e399a..0c02b0a1a7e99 100644 --- a/CondFormats/CTPPSReadoutObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc +++ b/CondFormats/PPSObjects/src/CTPPSRPAlignmentCorrectionsMethods.cc @@ -8,7 +8,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsMethods.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/typelookup.h" diff --git a/CondFormats/CTPPSReadoutObjects/src/LHCInterpolatedOpticalFunctionsSet.cc b/CondFormats/PPSObjects/src/LHCInterpolatedOpticalFunctionsSet.cc similarity index 95% rename from CondFormats/CTPPSReadoutObjects/src/LHCInterpolatedOpticalFunctionsSet.cc rename to CondFormats/PPSObjects/src/LHCInterpolatedOpticalFunctionsSet.cc index c5acdacd60c4d..d0adaa7882adb 100644 --- a/CondFormats/CTPPSReadoutObjects/src/LHCInterpolatedOpticalFunctionsSet.cc +++ b/CondFormats/PPSObjects/src/LHCInterpolatedOpticalFunctionsSet.cc @@ -1,6 +1,6 @@ // Original Author: Jan Kašpar -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" //---------------------------------------------------------------------------------------------------- diff --git a/CondFormats/CTPPSReadoutObjects/src/LHCOpticalFunctionsSet.cc b/CondFormats/PPSObjects/src/LHCOpticalFunctionsSet.cc similarity index 96% rename from CondFormats/CTPPSReadoutObjects/src/LHCOpticalFunctionsSet.cc rename to CondFormats/PPSObjects/src/LHCOpticalFunctionsSet.cc index 05ee3cbd08c51..bd22c910f2799 100644 --- a/CondFormats/CTPPSReadoutObjects/src/LHCOpticalFunctionsSet.cc +++ b/CondFormats/PPSObjects/src/LHCOpticalFunctionsSet.cc @@ -1,6 +1,6 @@ // Original Author: Jan Kašpar -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" #include "FWCore/Utilities/interface/Exception.h" diff --git a/CondFormats/CTPPSReadoutObjects/src/PPSTimingCalibration.cc b/CondFormats/PPSObjects/src/PPSTimingCalibration.cc similarity index 96% rename from CondFormats/CTPPSReadoutObjects/src/PPSTimingCalibration.cc rename to CondFormats/PPSObjects/src/PPSTimingCalibration.cc index bad63b26fc710..fd58a8548c178 100644 --- a/CondFormats/CTPPSReadoutObjects/src/PPSTimingCalibration.cc +++ b/CondFormats/PPSObjects/src/PPSTimingCalibration.cc @@ -7,7 +7,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" //-------------------------------------------------------------------------- diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSBeamParameters.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSBeamParameters.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSBeamParameters.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSBeamParameters.cc index 07fac4921dd76..df329d91099f3 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSBeamParameters.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSBeamParameters.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSBeamParameters); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc index 85f02316a7861..82ba006a5aad4 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelAnalysisMask.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSPixelAnalysisMask); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc index bbe3e21706d22..d7acf3d003cca 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelDAQMapping.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSPixelDAQMapping); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc index 892070c7f6916..62907d7f59a6e 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibration.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSPixelGainCalibration); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc index 4eb2df449e942..62f9d07f0b260 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSPixelGainCalibrations.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSPixelGainCalibrations); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc similarity index 54% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc rename to CondFormats/PPSObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc index abb5f7a115617..67df5cec4d915 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_CTPPSRPAlignmentCorrectionsData.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(CTPPSRPAlignmentCorrectionsData); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc b/CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc similarity index 54% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc rename to CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc index 1a2798e54ba97..a01f3a5a1db2f 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSet.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(LHCInterpolatedOpticalFunctionsSet); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc b/CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc similarity index 54% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc rename to CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc index bf10004105613..f98869e6c8f88 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_LHCInterpolatedOpticalFunctionsSetCollection.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(LHCInterpolatedOpticalFunctionsSetCollection); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc b/CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc rename to CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc index 25799a9eda263..ef72e793d3560 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSet.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(LHCOpticalFunctionsSet); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc b/CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc similarity index 54% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc rename to CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc index ce0e1a898f353..ae04c13f617fe 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_LHCOpticalFunctionsSetCollection.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(LHCOpticalFunctionsSetCollection); diff --git a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_PPSTimingCalibration.cc b/CondFormats/PPSObjects/src/T_EventSetup_PPSTimingCalibration.cc similarity index 55% rename from CondFormats/CTPPSReadoutObjects/src/T_EventSetup_PPSTimingCalibration.cc rename to CondFormats/PPSObjects/src/T_EventSetup_PPSTimingCalibration.cc index e27608bf64d8d..1f1b14f1a2ed7 100644 --- a/CondFormats/CTPPSReadoutObjects/src/T_EventSetup_PPSTimingCalibration.cc +++ b/CondFormats/PPSObjects/src/T_EventSetup_PPSTimingCalibration.cc @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include "FWCore/Utilities/interface/typelookup.h" TYPELOOKUP_DATA_REG(PPSTimingCalibration); diff --git a/CondFormats/CTPPSReadoutObjects/src/TotemAnalysisMask.cc b/CondFormats/PPSObjects/src/TotemAnalysisMask.cc similarity index 90% rename from CondFormats/CTPPSReadoutObjects/src/TotemAnalysisMask.cc rename to CondFormats/PPSObjects/src/TotemAnalysisMask.cc index 23e2f086f0764..54c0f3ded178e 100644 --- a/CondFormats/CTPPSReadoutObjects/src/TotemAnalysisMask.cc +++ b/CondFormats/PPSObjects/src/TotemAnalysisMask.cc @@ -9,7 +9,7 @@ #include "FWCore/Utilities/interface/typelookup.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" //---------------------------------------------------------------------------------------------------- diff --git a/CondFormats/CTPPSReadoutObjects/src/TotemDAQMapping.cc b/CondFormats/PPSObjects/src/TotemDAQMapping.cc similarity index 95% rename from CondFormats/CTPPSReadoutObjects/src/TotemDAQMapping.cc rename to CondFormats/PPSObjects/src/TotemDAQMapping.cc index 85f388b8b0a3e..49a7a5a339999 100644 --- a/CondFormats/CTPPSReadoutObjects/src/TotemDAQMapping.cc +++ b/CondFormats/PPSObjects/src/TotemDAQMapping.cc @@ -8,7 +8,7 @@ #include "FWCore/Utilities/interface/typelookup.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" using namespace std; diff --git a/CondFormats/CTPPSReadoutObjects/src/TotemFramePosition.cc b/CondFormats/PPSObjects/src/TotemFramePosition.cc similarity index 96% rename from CondFormats/CTPPSReadoutObjects/src/TotemFramePosition.cc rename to CondFormats/PPSObjects/src/TotemFramePosition.cc index 5450043dd66d2..36afa4948218c 100644 --- a/CondFormats/CTPPSReadoutObjects/src/TotemFramePosition.cc +++ b/CondFormats/PPSObjects/src/TotemFramePosition.cc @@ -6,7 +6,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" #include #include diff --git a/CondFormats/CTPPSReadoutObjects/src/TotemSymbId.cc b/CondFormats/PPSObjects/src/TotemSymbId.cc similarity index 87% rename from CondFormats/CTPPSReadoutObjects/src/TotemSymbId.cc rename to CondFormats/PPSObjects/src/TotemSymbId.cc index fc191d29d18ed..b34b08fa13539 100644 --- a/CondFormats/CTPPSReadoutObjects/src/TotemSymbId.cc +++ b/CondFormats/PPSObjects/src/TotemSymbId.cc @@ -6,7 +6,7 @@ * ****************************************************************************/ -#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h" +#include "CondFormats/PPSObjects/interface/TotemSymbId.h" #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" diff --git a/CondFormats/CTPPSReadoutObjects/src/classes.h b/CondFormats/PPSObjects/src/classes.h similarity index 94% rename from CondFormats/CTPPSReadoutObjects/src/classes.h rename to CondFormats/PPSObjects/src/classes.h index c8d6d087a5be1..a807863549254 100644 --- a/CondFormats/CTPPSReadoutObjects/src/classes.h +++ b/CondFormats/PPSObjects/src/classes.h @@ -1,4 +1,4 @@ -#include "CondFormats/CTPPSReadoutObjects/src/headers.h" +#include "CondFormats/PPSObjects/src/headers.h" namespace CondFormats_CTPPSPixelObjects { struct dictionary { diff --git a/CondFormats/CTPPSReadoutObjects/src/classes_def.xml b/CondFormats/PPSObjects/src/classes_def.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/src/classes_def.xml rename to CondFormats/PPSObjects/src/classes_def.xml diff --git a/CondFormats/PPSObjects/src/headers.h b/CondFormats/PPSObjects/src/headers.h new file mode 100644 index 0000000000000..a5202bc64b5e8 --- /dev/null +++ b/CondFormats/PPSObjects/src/headers.h @@ -0,0 +1,12 @@ +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsDataSequence.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" + +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" diff --git a/CondFormats/CTPPSReadoutObjects/test/BuildFile.xml b/CondFormats/PPSObjects/test/BuildFile.xml similarity index 55% rename from CondFormats/CTPPSReadoutObjects/test/BuildFile.xml rename to CondFormats/PPSObjects/test/BuildFile.xml index 6598cce3c526a..b4b34bf621ee7 100644 --- a/CondFormats/CTPPSReadoutObjects/test/BuildFile.xml +++ b/CondFormats/PPSObjects/test/BuildFile.xml @@ -1,11 +1,11 @@ - + - + - + diff --git a/CondFormats/CTPPSReadoutObjects/test/testSerializationBeamParameters.cc b/CondFormats/PPSObjects/test/testSerializationBeamParameters.cc similarity index 69% rename from CondFormats/CTPPSReadoutObjects/test/testSerializationBeamParameters.cc rename to CondFormats/PPSObjects/test/testSerializationBeamParameters.cc index 1a9438be1b542..fa7b74d401979 100644 --- a/CondFormats/CTPPSReadoutObjects/test/testSerializationBeamParameters.cc +++ b/CondFormats/PPSObjects/test/testSerializationBeamParameters.cc @@ -1,5 +1,5 @@ #include "CondFormats/Serialization/interface/Test.h" -#include "CondFormats/CTPPSReadoutObjects/src/headers.h" +#include "CondFormats/PPSObjects/src/headers.h" int main() { testSerialization(); diff --git a/CondFormats/CTPPSReadoutObjects/test/testSerializationLHCOpticalFunctionsSet.cc b/CondFormats/PPSObjects/test/testSerializationLHCOpticalFunctionsSet.cc similarity index 52% rename from CondFormats/CTPPSReadoutObjects/test/testSerializationLHCOpticalFunctionsSet.cc rename to CondFormats/PPSObjects/test/testSerializationLHCOpticalFunctionsSet.cc index 82913fd0ef162..b81a040bf78fa 100644 --- a/CondFormats/CTPPSReadoutObjects/test/testSerializationLHCOpticalFunctionsSet.cc +++ b/CondFormats/PPSObjects/test/testSerializationLHCOpticalFunctionsSet.cc @@ -1,6 +1,6 @@ #include "CondFormats/Serialization/interface/Test.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSet.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" int main() { testSerialization(); diff --git a/CondFormats/CTPPSReadoutObjects/test/testSerializationPPSTimingCalibration.cc b/CondFormats/PPSObjects/test/testSerializationPPSTimingCalibration.cc similarity index 75% rename from CondFormats/CTPPSReadoutObjects/test/testSerializationPPSTimingCalibration.cc rename to CondFormats/PPSObjects/test/testSerializationPPSTimingCalibration.cc index fcf8031194283..de9d3c2f887cb 100644 --- a/CondFormats/CTPPSReadoutObjects/test/testSerializationPPSTimingCalibration.cc +++ b/CondFormats/PPSObjects/test/testSerializationPPSTimingCalibration.cc @@ -1,5 +1,5 @@ #include "CondFormats/Serialization/interface/Test.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" int main() { testSerialization(); diff --git a/CondFormats/CTPPSReadoutObjects/test/test_BeamParametersESSource.py b/CondFormats/PPSObjects/test/test_BeamParametersESSource.py similarity index 96% rename from CondFormats/CTPPSReadoutObjects/test/test_BeamParametersESSource.py rename to CondFormats/PPSObjects/test/test_BeamParametersESSource.py index d31be1e81c0eb..e257caf5b93b6 100644 --- a/CondFormats/CTPPSReadoutObjects/test/test_BeamParametersESSource.py +++ b/CondFormats/PPSObjects/test/test_BeamParametersESSource.py @@ -29,7 +29,7 @@ ) # Load beam parameters -process.load("CondFormats.CTPPSReadoutObjects.CTPPSBeamParametersESSource_cfi") +process.load("CondFormats.PPSObjects.CTPPSBeamParametersESSource_cfi") # process.CTPPSBeamParametersESSource.verbosity = cms.untracked.uint32(2) # Test retrieving the ESSource data diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond.xml rename to CondFormats/PPSObjects/xml/mapping_timing_diamond.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2017.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2017.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2017.xml rename to CondFormats/PPSObjects/xml/mapping_timing_diamond_2017.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml b/CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml rename to CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_totem_timing_2018.xml b/CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_totem_timing_2018.xml rename to CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml rename to CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml rename to CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2017.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2017.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2017.xml rename to CondFormats/PPSObjects/xml/mapping_tracking_strip_2017.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2018.xml b/CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2018.xml rename to CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/rpix_channel_mask_220_far.xml b/CondFormats/PPSObjects/xml/rpix_channel_mask_220_far.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/rpix_channel_mask_220_far.xml rename to CondFormats/PPSObjects/xml/rpix_channel_mask_220_far.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_2018.xml b/CondFormats/PPSObjects/xml/rpix_mapping_2018.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_2018.xml rename to CondFormats/PPSObjects/xml/rpix_mapping_2018.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_220_far.xml b/CondFormats/PPSObjects/xml/rpix_mapping_220_far.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_220_far.xml rename to CondFormats/PPSObjects/xml/rpix_mapping_220_far.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml b/CondFormats/PPSObjects/xml/sample_alignment_corrections.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml rename to CondFormats/PPSObjects/xml/sample_alignment_corrections.xml diff --git a/CondFormats/CTPPSReadoutObjects/xml/totem_rp_mask_example.xml b/CondFormats/PPSObjects/xml/totem_rp_mask_example.xml similarity index 100% rename from CondFormats/CTPPSReadoutObjects/xml/totem_rp_mask_example.xml rename to CondFormats/PPSObjects/xml/totem_rp_mask_example.xml diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index d7afeb7af2845..9ef8d956ad617 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -38,7 +38,7 @@ #local reconstruction from RecoLocalTracker.Configuration.RecoLocalTracker_cff import * from RecoParticleFlow.Configuration.RecoParticleFlow_cff import * -from RecoCTPPS.Configuration.recoCTPPS_cff import * +from RecoPPS.Configuration.recoCTPPS_cff import * # # new tau configuration # diff --git a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc index 4df8e8b804585..6b65179139b08 100644 --- a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc @@ -19,7 +19,7 @@ #include "DataFormats/Common/interface/DetSetVector.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigi.h" #include "DataFormats/CTPPSReco/interface/CTPPSPixelCluster.h" @@ -763,4 +763,4 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const } //--------------------------------------------------------------------------- -DEFINE_FWK_MODULE(CTPPSPixelDQMSource); \ No newline at end of file +DEFINE_FWK_MODULE(CTPPSPixelDQMSource); diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py index b6ed61915d7fa..2ba84dc9f8f79 100644 --- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py +++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py @@ -41,7 +41,7 @@ ) # geometry definition and reco modules -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # CTPPS DQM modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py index dede9519e51f1..251413f07c951 100644 --- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py +++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py @@ -37,7 +37,7 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_DD_cff") +process.load("RecoPPS.Configuration.recoCTPPS_DD_cff") process.load('EventFilter.OnlineMetaDataRawToDigi.onlineMetaDataRawToDigi_cfi') process.onlineMetaDataDigis = cms.EDProducer('OnlineMetaDataRawToDigi') diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py index f5b62d294a0d2..a7fb39a678b5e 100644 --- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py +++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py @@ -62,7 +62,7 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # CTPPS DQM modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/DQM/CTPPS/test/diamond_dqm_test_cfg.py b/DQM/CTPPS/test/diamond_dqm_test_cfg.py index a3b94b7e6ef7f..78eeebdfa86c8 100644 --- a/DQM/CTPPS/test/diamond_dqm_test_cfg.py +++ b/DQM/CTPPS/test/diamond_dqm_test_cfg.py @@ -46,16 +46,16 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # rechits production -process.load('RecoCTPPS.TotemRPLocal.ctppsDiamondRecHits_cfi') +process.load('RecoPPS.Local.ctppsDiamondRecHits_cfi') # local tracks fitter -process.load('RecoCTPPS.TotemRPLocal.ctppsDiamondLocalTracks_cfi') +process.load('RecoPPS.Local.ctppsDiamondLocalTracks_cfi') # pixel -process.load('RecoCTPPS.PixelLocal.ctppsPixelLocalTracks_cfi') +process.load('RecoPPS.Local.ctppsPixelLocalTracks_cfi') # CTPPS DQM modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/DQM/CTPPS/test/pixel_dqm_test_cfg.py b/DQM/CTPPS/test/pixel_dqm_test_cfg.py index 9fa252ae7eb9c..70f5b1089ccb5 100644 --- a/DQM/CTPPS/test/pixel_dqm_test_cfg.py +++ b/DQM/CTPPS/test/pixel_dqm_test_cfg.py @@ -41,7 +41,7 @@ # local RP reconstruction chain with standard settings process.load('Geometry.VeryForwardGeometry.geometryRP_cfi') -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # CTPPS DQM modules process.load("DQM.CTPPS.totemDQM_cff") diff --git a/DQM/CTPPS/test/strip_dqm_test_cfg.py b/DQM/CTPPS/test/strip_dqm_test_cfg.py index e19d49022abde..7eb0f4d3c6cab 100644 --- a/DQM/CTPPS/test/strip_dqm_test_cfg.py +++ b/DQM/CTPPS/test/strip_dqm_test_cfg.py @@ -45,7 +45,7 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # CTPPS DQM modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/DQM/CTPPS/test/timing_dqm_test_cfg.py b/DQM/CTPPS/test/timing_dqm_test_cfg.py index 3dc0c956054f0..8cd2ceaf1f7fc 100644 --- a/DQM/CTPPS/test/timing_dqm_test_cfg.py +++ b/DQM/CTPPS/test/timing_dqm_test_cfg.py @@ -48,11 +48,11 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # load local geometry to avoid GT process.load('Geometry.VeryForwardGeometry.geometryRPFromDD_2018_cfi') -process.load('RecoCTPPS.TotemRPLocal.totemTimingLocalReconstruction_cff') +process.load('RecoPPS.Local.totemTimingLocalReconstruction_cff') # CTPPS DQM modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py index bcd5680de3c59..bf80abdcf864b 100644 --- a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py @@ -50,7 +50,7 @@ # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # DQM Modules process.load("DQM.CTPPS.ctppsDQM_cff") diff --git a/EventFilter/CTPPSRawToDigi/BuildFile.xml b/EventFilter/CTPPSRawToDigi/BuildFile.xml index 7ce0933cfdeee..f63c93d6c389a 100644 --- a/EventFilter/CTPPSRawToDigi/BuildFile.xml +++ b/EventFilter/CTPPSRawToDigi/BuildFile.xml @@ -8,7 +8,7 @@ - + diff --git a/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h b/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h index bb77c8a7094c8..dcc0a9c2248a2 100644 --- a/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h +++ b/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h @@ -33,12 +33,12 @@ #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigi.h" #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDataError.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "EventFilter/CTPPSRawToDigi/interface/RPixErrorChecker.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" #include "EventFilter/CTPPSRawToDigi/interface/ElectronicIndex.h" #include "FWCore/Utilities/interface/typedefs.h" diff --git a/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelRawToDigi.h b/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelRawToDigi.h index d987087e7801a..a04c5eb7d65be 100644 --- a/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelRawToDigi.h +++ b/EventFilter/CTPPSRawToDigi/interface/CTPPSPixelRawToDigi.h @@ -13,7 +13,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "FWCore/Framework/interface/ConsumesCollector.h" diff --git a/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h b/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h index 4e6e2c3ec1e97..6bac669c6f916 100644 --- a/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h +++ b/EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h @@ -11,7 +11,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/DetSetVector.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" #include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h" #include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h" diff --git a/EventFilter/CTPPSRawToDigi/interface/CounterChecker.h b/EventFilter/CTPPSRawToDigi/interface/CounterChecker.h index 09b508d3dfe7b..56dab96971b07 100644 --- a/EventFilter/CTPPSRawToDigi/interface/CounterChecker.h +++ b/EventFilter/CTPPSRawToDigi/interface/CounterChecker.h @@ -15,7 +15,7 @@ #include #include -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" #include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h" diff --git a/EventFilter/CTPPSRawToDigi/interface/RawToDigiConverter.h b/EventFilter/CTPPSRawToDigi/interface/RawToDigiConverter.h index 971188e97f1d4..b5b79493de35f 100644 --- a/EventFilter/CTPPSRawToDigi/interface/RawToDigiConverter.h +++ b/EventFilter/CTPPSRawToDigi/interface/RawToDigiConverter.h @@ -14,8 +14,8 @@ #include "EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" #include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h" #include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h" diff --git a/EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h b/EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h index afd8552ed0fbb..3f4fbb7033646 100644 --- a/EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h +++ b/EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h @@ -9,7 +9,7 @@ #ifndef EventFilter_CTPPSRawToDigi_VFATFrameCollection #define EventFilter_CTPPSRawToDigi_VFATFrameCollection -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" #include "EventFilter/CTPPSRawToDigi/interface/VFATFrame.h" diff --git a/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml b/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml index 01049248b4f71..5884bc96ef6a4 100644 --- a/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml +++ b/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml @@ -9,7 +9,7 @@ - + diff --git a/EventFilter/CTPPSRawToDigi/plugins/CTPPSPixelDigiToRaw.cc b/EventFilter/CTPPSRawToDigi/plugins/CTPPSPixelDigiToRaw.cc index cc134846cb8a1..ab1bba21bbb36 100644 --- a/EventFilter/CTPPSRawToDigi/plugins/CTPPSPixelDigiToRaw.cc +++ b/EventFilter/CTPPSRawToDigi/plugins/CTPPSPixelDigiToRaw.cc @@ -49,8 +49,8 @@ Description: [one line class summary] #include "EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h" #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelFramePosition.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelFramePosition.h" #include "FWCore/PluginManager/interface/ModuleDef.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/EventFilter/CTPPSRawToDigi/plugins/CTPPSTotemDigiToRaw.cc b/EventFilter/CTPPSRawToDigi/plugins/CTPPSTotemDigiToRaw.cc index ee3d6d0a3d5a2..2af9219d590ef 100644 --- a/EventFilter/CTPPSRawToDigi/plugins/CTPPSTotemDigiToRaw.cc +++ b/EventFilter/CTPPSRawToDigi/plugins/CTPPSTotemDigiToRaw.cc @@ -36,8 +36,8 @@ Description: [one line class summary] #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/StreamID.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemFramePosition.h" #include "CondFormats/DataRecord/interface/TotemReadoutRcd.h" #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h" diff --git a/EventFilter/CTPPSRawToDigi/plugins/TotemVFATRawToDigi.cc b/EventFilter/CTPPSRawToDigi/plugins/TotemVFATRawToDigi.cc index e6678641627dd..428bd93c386e3 100644 --- a/EventFilter/CTPPSRawToDigi/plugins/TotemVFATRawToDigi.cc +++ b/EventFilter/CTPPSRawToDigi/plugins/TotemVFATRawToDigi.cc @@ -24,8 +24,8 @@ #include "DataFormats/CTPPSDigi/interface/TotemFEDInfo.h" #include "CondFormats/DataRecord/interface/TotemReadoutRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" #include "EventFilter/CTPPSRawToDigi/interface/SimpleVFATFrameCollection.h" #include "EventFilter/CTPPSRawToDigi/interface/RawDataUnpacker.h" diff --git a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py index 944ab3c286115..9151ec8467804 100644 --- a/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py +++ b/EventFilter/CTPPSRawToDigi/python/ctppsRawToDigi_cff.py @@ -12,7 +12,7 @@ # 2016, before TS2 cms.PSet( validityRange = cms.EventRange("1:min - 280385:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_to_fill_5288.xml"), maskFileNames = cms.vstring() ), # 2016, during TS2 @@ -24,19 +24,19 @@ # 2016, after TS2 cms.PSet( validityRange = cms.EventRange("281601:min - 290872:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2016_from_fill_5330.xml"), maskFileNames = cms.vstring() ), # 2017 cms.PSet( validityRange = cms.EventRange("290873:min - 311625:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2017.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2017.xml"), maskFileNames = cms.vstring() ), # 2018 cms.PSet( validityRange = cms.EventRange("311626:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_tracking_strip_2018.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_tracking_strip_2018.xml"), maskFileNames = cms.vstring() ) ) @@ -65,19 +65,19 @@ # 2016, after diamonds inserted in DAQ cms.PSet( validityRange = cms.EventRange("283820:min - 292520:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond.xml"), maskFileNames = cms.vstring() ), # 2017 cms.PSet( validityRange = cms.EventRange("292521:min - 310000:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2017.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2017.xml"), maskFileNames = cms.vstring() ), # 2018 cms.PSet( validityRange = cms.EventRange("310001:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_timing_diamond_2018.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_timing_diamond_2018.xml"), maskFileNames = cms.vstring() ) ) @@ -100,7 +100,7 @@ # 2018 cms.PSet( validityRange = cms.EventRange("310001:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/mapping_totem_timing_2018.xml"), + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/mapping_totem_timing_2018.xml"), maskFileNames = cms.vstring() ) ) diff --git a/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc b/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc index 5b9488286dede..35bdf10669983 100644 --- a/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc +++ b/EventFilter/CTPPSRawToDigi/src/CTPPSPixelDataFormatter.cc @@ -4,7 +4,7 @@ #include "DataFormats/FEDRawData/interface/FEDHeader.h" #include "DataFormats/FEDRawData/interface/FEDTrailer.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelROC.h" //KS +#include "CondFormats/PPSObjects/interface/CTPPSPixelROC.h" //KS #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/EventFilter/CTPPSRawToDigi/test/ctppsPixelTest.py b/EventFilter/CTPPSRawToDigi/test/ctppsPixelTest.py index 5fa0efe6fbede..72ed5f71fd96c 100644 --- a/EventFilter/CTPPSRawToDigi/test/ctppsPixelTest.py +++ b/EventFilter/CTPPSRawToDigi/test/ctppsPixelTest.py @@ -4,13 +4,13 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") process.ctppsPixelDAQMappingESSourceXML.configuration = cms.VPSet( # example configuration block: cms.PSet( validityRange = cms.EventRange("1:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_220_far.xml"), - maskFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_channel_mask_220_far.xml") + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_mapping_220_far.xml"), + maskFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_channel_mask_220_far.xml") ) ) diff --git a/EventFilter/CTPPSRawToDigi/test/test_pixels_only_cfg.py b/EventFilter/CTPPSRawToDigi/test/test_pixels_only_cfg.py index 00123dadc0f3b..a8dc1bff9e5d1 100644 --- a/EventFilter/CTPPSRawToDigi/test/test_pixels_only_cfg.py +++ b/EventFilter/CTPPSRawToDigi/test/test_pixels_only_cfg.py @@ -34,8 +34,8 @@ # example configuration block: cms.PSet( validityRange = cms.EventRange("1:min - 999999999:max"), - mappingFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_mapping_220_far.xml"), - maskFileNames = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/rpix_channel_mask_220_far.xml") + mappingFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_mapping_220_far.xml"), + maskFileNames = cms.vstring("CondFormats/PPSObjects/xml/rpix_channel_mask_220_far.xml") ) ) diff --git a/Geometry/VeryForwardGeometry/interface/CTPPSPixelTopology.h b/Geometry/VeryForwardGeometry/interface/CTPPSPixelTopology.h index 86a73c43deb4b..de017c8916949 100644 --- a/Geometry/VeryForwardGeometry/interface/CTPPSPixelTopology.h +++ b/Geometry/VeryForwardGeometry/interface/CTPPSPixelTopology.h @@ -1,7 +1,7 @@ #ifndef Geometry_VeryForwardGeometry_CTPPSPixelTopology_h #define Geometry_VeryForwardGeometry_CTPPSPixelTopology_h -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" /** *\brief Geometrical and topological information on RPix silicon detector. diff --git a/Geometry/VeryForwardGeometryBuilder/BuildFile.xml b/Geometry/VeryForwardGeometryBuilder/BuildFile.xml index 29503d29a2304..d2eaeefc3511c 100644 --- a/Geometry/VeryForwardGeometryBuilder/BuildFile.xml +++ b/Geometry/VeryForwardGeometryBuilder/BuildFile.xml @@ -2,7 +2,7 @@ - + diff --git a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc index c37ec2391d3da..b0986f1ca31d5 100644 --- a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc +++ b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc @@ -19,7 +19,7 @@ #include "DetectorDescription/Core/interface/DDSpecifics.h" #include "DetectorDescription/Core/interface/DDRotationMatrix.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h" #include "DataFormats/CTPPSDetId/interface/TotemTimingDetId.h" diff --git a/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc b/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc index cbca43b9df850..efc2dcc23e2d1 100644 --- a/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc +++ b/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc @@ -16,7 +16,7 @@ #include "DetectorDescription/Core/interface/DDSolid.h" //#include "DataFormats/CTPPSAlignment/interface/RPAlignmentCorrectionData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionData.h" using namespace std; diff --git a/Geometry/VeryForwardGeometryBuilder/test/print_geometry_info_XML_cfg.py b/Geometry/VeryForwardGeometryBuilder/test/print_geometry_info_XML_cfg.py index d2c29b597129a..4eb190a575836 100644 --- a/Geometry/VeryForwardGeometryBuilder/test/print_geometry_info_XML_cfg.py +++ b/Geometry/VeryForwardGeometryBuilder/test/print_geometry_info_XML_cfg.py @@ -14,7 +14,7 @@ process.load("Geometry.VeryForwardGeometry.geometryRPFromDD_2017_cfi") # load alignment correction -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring( "Geometry/VeryForwardGeometryBuilder/test/CTPPSIncludeAlignmentCorrectionsXML/alignment_file_1.xml", "Geometry/VeryForwardGeometryBuilder/test/CTPPSIncludeAlignmentCorrectionsXML/alignment_file_2.xml", diff --git a/IOMC/EventVertexGenerators/BuildFile.xml b/IOMC/EventVertexGenerators/BuildFile.xml index 86b4a6e9eef6e..da61e96e933d6 100644 --- a/IOMC/EventVertexGenerators/BuildFile.xml +++ b/IOMC/EventVertexGenerators/BuildFile.xml @@ -10,5 +10,5 @@ - + diff --git a/RecoCTPPS/Configuration/python/recoCTPPS_cff.py b/RecoCTPPS/Configuration/python/recoCTPPS_cff.py deleted file mode 100644 index c3fdf7f4563c8..0000000000000 --- a/RecoCTPPS/Configuration/python/recoCTPPS_cff.py +++ /dev/null @@ -1,22 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from RecoCTPPS.TotemRPLocal.totemRPLocalReconstruction_cff import * -from RecoCTPPS.TotemRPLocal.ctppsDiamondLocalReconstruction_cff import * -from RecoCTPPS.TotemRPLocal.totemTimingLocalReconstruction_cff import * -from RecoCTPPS.PixelLocal.ctppsPixelLocalReconstruction_cff import * - -from RecoCTPPS.TotemRPLocal.ctppsLocalTrackLiteProducer_cff import ctppsLocalTrackLiteProducer - -from RecoCTPPS.ProtonReconstruction.ctppsProtons_cff import * - -from Geometry.VeryForwardGeometry.geometryRPFromDB_cfi import * - -recoCTPPSTask = cms.Task( - totemRPLocalReconstructionTask , - ctppsDiamondLocalReconstructionTask , - totemTimingLocalReconstructionTask , - ctppsPixelLocalReconstructionTask , - ctppsLocalTrackLiteProducer , - ctppsProtons -) -recoCTPPS = cms.Sequence(recoCTPPSTask) diff --git a/RecoCTPPS/PixelLocal/plugins/BuildFile.xml b/RecoCTPPS/PixelLocal/plugins/BuildFile.xml deleted file mode 100644 index 97a7e263cca62..0000000000000 --- a/RecoCTPPS/PixelLocal/plugins/BuildFile.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/RecoCTPPS/TotemRPLocal/BuildFile.xml b/RecoCTPPS/TotemRPLocal/BuildFile.xml deleted file mode 100644 index 537a0f6643708..0000000000000 --- a/RecoCTPPS/TotemRPLocal/BuildFile.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py b/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py similarity index 89% rename from RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py rename to RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py index df8837853ad52..b3eef83e81fdb 100644 --- a/RecoCTPPS/Configuration/python/RecoCTPPS_EventContent_cff.py +++ b/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -RecoCTPPSAOD = cms.PSet( +RecoPPSAOD = cms.PSet( outputCommands = cms.untracked.vstring( # trigger counters 'keep TotemTriggerCounters_totemTriggerRawToDigi_*_*', @@ -40,14 +40,14 @@ ) -RecoCTPPSRECO = cms.PSet( +RecoPPSRECO = cms.PSet( outputCommands = cms.untracked.vstring() ) -RecoCTPPSFEVT = cms.PSet( +RecoPPSFEVT = cms.PSet( outputCommands = cms.untracked.vstring() ) -RecoCTPPSRECO.outputCommands.extend(RecoCTPPSAOD.outputCommands) -RecoCTPPSFEVT.outputCommands.extend(RecoCTPPSRECO.outputCommands) +RecoPPSRECO.outputCommands.extend(RecoPPSAOD.outputCommands) +RecoPPSFEVT.outputCommands.extend(RecoPPSRECO.outputCommands) diff --git a/RecoPPS/Configuration/python/recoCTPPS_cff.py b/RecoPPS/Configuration/python/recoCTPPS_cff.py new file mode 100644 index 0000000000000..b6dfb835931bc --- /dev/null +++ b/RecoPPS/Configuration/python/recoCTPPS_cff.py @@ -0,0 +1,22 @@ +import FWCore.ParameterSet.Config as cms + +from RecoPPS.Local.totemRPLocalReconstruction_cff import * +from RecoPPS.Local.ctppsDiamondLocalReconstruction_cff import * +from RecoPPS.Local.totemTimingLocalReconstruction_cff import * +from RecoPPS.Local.ctppsPixelLocalReconstruction_cff import * + +from RecoPPS.Local.ctppsLocalTrackLiteProducer_cff import ctppsLocalTrackLiteProducer + +from RecoPPS.ProtonReconstruction.ctppsProtons_cff import * + +from Geometry.VeryForwardGeometry.geometryRPFromDB_cfi import * + +recoCTPPSTask = cms.Task( + totemRPLocalReconstructionTask , + ctppsDiamondLocalReconstructionTask , + totemTimingLocalReconstructionTask , + ctppsPixelLocalReconstructionTask , + ctppsLocalTrackLiteProducer , + ctppsProtons +) +recoCTPPS = cms.Sequence(recoCTPPSTask) diff --git a/RecoCTPPS/Configuration/test/raw_data_test.py b/RecoPPS/Configuration/test/raw_data_test.py similarity index 90% rename from RecoCTPPS/Configuration/test/raw_data_test.py rename to RecoPPS/Configuration/test/raw_data_test.py index 3a20056b5668a..faf0e6ef123fc 100644 --- a/RecoCTPPS/Configuration/test/raw_data_test.py +++ b/RecoPPS/Configuration/test/raw_data_test.py @@ -40,7 +40,7 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") process.p = cms.Path( process.ctppsRawToDigi * @@ -48,10 +48,10 @@ ) # output configuration -from RecoCTPPS.Configuration.RecoCTPPS_EventContent_cff import RecoCTPPSAOD +from RecoPPS.Configuration.RecoPPS_EventContent_cff import RecoPPSAOD process.output = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("file:./AOD.root"), - outputCommands = RecoCTPPSAOD.outputCommands + outputCommands = RecoPPSAOD.outputCommands ) process.outpath = cms.EndPath(process.output) diff --git a/RecoCTPPS/PixelLocal/BuildFile.xml b/RecoPPS/Local/BuildFile.xml similarity index 79% rename from RecoCTPPS/PixelLocal/BuildFile.xml rename to RecoPPS/Local/BuildFile.xml index 1b0c338069217..f30956731fa40 100644 --- a/RecoCTPPS/PixelLocal/BuildFile.xml +++ b/RecoPPS/Local/BuildFile.xml @@ -1,11 +1,10 @@ - - + diff --git a/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h b/RecoPPS/Local/interface/CTPPSDiamondRecHitProducerAlgorithm.h similarity index 86% rename from RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h rename to RecoPPS/Local/interface/CTPPSDiamondRecHitProducerAlgorithm.h index 002929e939c19..2a5aef503107a 100644 --- a/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h +++ b/RecoPPS/Local/interface/CTPPSDiamondRecHitProducerAlgorithm.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_CTPPSDiamondRecHitProducerAlgorithm -#define RecoCTPPS_TotemRPLocal_CTPPSDiamondRecHitProducerAlgorithm +#ifndef RecoPPS_Local_CTPPSDiamondRecHitProducerAlgorithm +#define RecoPPS_Local_CTPPSDiamondRecHitProducerAlgorithm #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "CommonTools/Utils/interface/FormulaEvaluator.h" @@ -21,7 +21,7 @@ #include "Geometry/VeryForwardRPTopology/interface/RPTopology.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" class CTPPSDiamondRecHitProducerAlgorithm { public: diff --git a/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h b/RecoPPS/Local/interface/CTPPSDiamondTrackRecognition.h similarity index 86% rename from RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h rename to RecoPPS/Local/interface/CTPPSDiamondTrackRecognition.h index dfa489f2fbc31..4ed4085047558 100644 --- a/RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h +++ b/RecoPPS/Local/interface/CTPPSDiamondTrackRecognition.h @@ -8,14 +8,14 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_CTPPSDiamondTrackRecognition -#define RecoCTPPS_TotemRPLocal_CTPPSDiamondTrackRecognition +#ifndef RecoPPS_Local_CTPPSDiamondTrackRecognition +#define RecoPPS_Local_CTPPSDiamondTrackRecognition #include "DataFormats/Common/interface/DetSet.h" #include "DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h" #include "DataFormats/CTPPSReco/interface/CTPPSDiamondLocalTrack.h" -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSTimingTrackRecognition.h" +#include "RecoPPS/Local/interface/CTPPSTimingTrackRecognition.h" #include diff --git a/RecoCTPPS/PixelLocal/interface/CTPPSPixelClusterProducer.h b/RecoPPS/Local/interface/CTPPSPixelClusterProducer.h similarity index 83% rename from RecoCTPPS/PixelLocal/interface/CTPPSPixelClusterProducer.h rename to RecoPPS/Local/interface/CTPPSPixelClusterProducer.h index 05a110ff928d4..1cecca6b233d6 100644 --- a/RecoCTPPS/PixelLocal/interface/CTPPSPixelClusterProducer.h +++ b/RecoPPS/Local/interface/CTPPSPixelClusterProducer.h @@ -3,8 +3,8 @@ * Author: F.Ferro fabrizio.ferro@ge.infn.it - INFN Genova - 2017 * **********************************************************************/ -#ifndef RecoCTPPS_PixelLocal_CTPPSPixelClusterProducer -#define RecoCTPPS_PixelLocal_CTPPSPixelClusterProducer +#ifndef RecoPPS_Local_CTPPSPixelClusterProducer +#define RecoPPS_Local_CTPPSPixelClusterProducer #include "FWCore/Framework/interface/MakerMacros.h" #include "DataFormats/Common/interface/DetSetVector.h" @@ -28,10 +28,10 @@ #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" +#include "RecoPPS/Local/interface/RPixDetClusterizer.h" #include #include diff --git a/RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h b/RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h similarity index 74% rename from RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h rename to RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h index 20ff3f6ccc591..52eed2dc6d1fd 100644 --- a/RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h +++ b/RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h @@ -1,11 +1,11 @@ -#ifndef RecoCTPPS_PixelLocal_CTPPSPixelGainCalibrationDBService_h -#define RecoCTPPS_PixelLocal_CTPPSPixelGainCalibrationDBService_h +#ifndef RecoPPS_Local_CTPPSPixelGainCalibrationDBService_h +#define RecoPPS_Local_CTPPSPixelGainCalibrationDBService_h // -*- C++ -*- // -// Package: RecoCTPPS/PixelLocal +// Package: RecoPPS/Local // Class : CTPPSPixelGainCalibrationDBService // -/**\class CTPPSPixelGainCalibrationDBService CTPPSPixelGainCalibrationDBService.h "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +/**\class CTPPSPixelGainCalibrationDBService CTPPSPixelGainCalibrationDBService.h "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" Description: [one line class summary] @@ -19,7 +19,7 @@ // #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" class CTPPSPixelGainCalibrationDBService { public: CTPPSPixelGainCalibrationDBService(); diff --git a/RecoCTPPS/PixelLocal/interface/CTPPSPixelRecHitProducer.h b/RecoPPS/Local/interface/CTPPSPixelRecHitProducer.h similarity index 90% rename from RecoCTPPS/PixelLocal/interface/CTPPSPixelRecHitProducer.h rename to RecoPPS/Local/interface/CTPPSPixelRecHitProducer.h index 07b4286c43264..b72db43212d16 100644 --- a/RecoCTPPS/PixelLocal/interface/CTPPSPixelRecHitProducer.h +++ b/RecoPPS/Local/interface/CTPPSPixelRecHitProducer.h @@ -3,8 +3,8 @@ * Author: F.Ferro - INFN Genova * **********************************************************************/ -#ifndef RecoCTPPS_PixelLocal_CTPPSPixelRecHitProducer_H -#define RecoCTPPS_PixelLocal_CTPPSPixelRecHitProducer_H +#ifndef RecoPPS_Local_CTPPSPixelRecHitProducer_H +#define RecoPPS_Local_CTPPSPixelRecHitProducer_H #include "FWCore/Framework/interface/MakerMacros.h" #include "DataFormats/Common/interface/DetSetVector.h" @@ -24,7 +24,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" -#include "RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h" +#include "RecoPPS/Local/interface/RPixClusterToHit.h" class CTPPSPixelRecHitProducer : public edm::stream::EDProducer<> { public: diff --git a/RecoCTPPS/TotemRPLocal/interface/CTPPSTimingTrackRecognition.h b/RecoPPS/Local/interface/CTPPSTimingTrackRecognition.h similarity index 98% rename from RecoCTPPS/TotemRPLocal/interface/CTPPSTimingTrackRecognition.h rename to RecoPPS/Local/interface/CTPPSTimingTrackRecognition.h index dec40ae5f2f41..33ffba362617a 100644 --- a/RecoCTPPS/TotemRPLocal/interface/CTPPSTimingTrackRecognition.h +++ b/RecoPPS/Local/interface/CTPPSTimingTrackRecognition.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_CTPPSTimingTrackRecognition -#define RecoCTPPS_TotemRPLocal_CTPPSTimingTrackRecognition +#ifndef RecoPPS_Local_CTPPSTimingTrackRecognition +#define RecoPPS_Local_CTPPSTimingTrackRecognition #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/Exception.h" diff --git a/RecoCTPPS/TotemRPLocal/interface/FastLineRecognition.h b/RecoPPS/Local/interface/FastLineRecognition.h similarity index 96% rename from RecoCTPPS/TotemRPLocal/interface/FastLineRecognition.h rename to RecoPPS/Local/interface/FastLineRecognition.h index 942183208ccef..72d90c65d772e 100644 --- a/RecoCTPPS/TotemRPLocal/interface/FastLineRecognition.h +++ b/RecoPPS/Local/interface/FastLineRecognition.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_FastLineRecognition -#define RecoCTPPS_TotemRPLocal_FastLineRecognition +#ifndef RecoPPS_Local_FastLineRecognition +#define RecoPPS_Local_FastLineRecognition #include "DataFormats/Common/interface/DetSet.h" #include "DataFormats/Common/interface/DetSetVector.h" diff --git a/RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h b/RecoPPS/Local/interface/RPixClusterToHit.h similarity index 90% rename from RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h rename to RecoPPS/Local/interface/RPixClusterToHit.h index 0f11c7d5c5cd8..897f72ba390c4 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h +++ b/RecoPPS/Local/interface/RPixClusterToHit.h @@ -3,8 +3,8 @@ * Author: F.Ferro - INFN Genova * **********************************************************************/ -#ifndef RecoCTPPS_PixelLocal_RPixClusterToHit_H -#define RecoCTPPS_PixelLocal_RPixClusterToHit_H +#ifndef RecoPPS_Local_RPixClusterToHit_H +#define RecoPPS_Local_RPixClusterToHit_H #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/DetSetVector.h" diff --git a/RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h b/RecoPPS/Local/interface/RPixDetClusterizer.h similarity index 88% rename from RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h rename to RecoPPS/Local/interface/RPixDetClusterizer.h index ba31e3cd8bb5e..4230d34b60394 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h +++ b/RecoPPS/Local/interface/RPixDetClusterizer.h @@ -4,8 +4,8 @@ * September 2016 * **********************************************************************/ -#ifndef RecoCTPPS_PixelLocal_RPixDetClusterizer_H -#define RecoCTPPS_PixelLocal_RPixDetClusterizer_H +#ifndef RecoPPS_Local_RPixDetClusterizer_H +#define RecoPPS_Local_RPixDetClusterizer_H #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -15,10 +15,10 @@ #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigiCollection.h" #include "DataFormats/CTPPSReco/interface/CTPPSPixelCluster.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include #include diff --git a/RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h b/RecoPPS/Local/interface/RPixDetPatternFinder.h similarity index 93% rename from RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h rename to RecoPPS/Local/interface/RPixDetPatternFinder.h index 139c35169714f..c431496a11e40 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h +++ b/RecoPPS/Local/interface/RPixDetPatternFinder.h @@ -7,8 +7,8 @@ * Fabio Ravera (fabio.ravera@cern.ch) * */ -#ifndef RecoCTPPS_PixelLocal_RPixDetPatternFinder_H -#define RecoCTPPS_PixelLocal_RPixDetPatternFinder_H +#ifndef RecoPPS_Local_RPixDetPatternFinder_H +#define RecoPPS_Local_RPixDetPatternFinder_H #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoCTPPS/PixelLocal/interface/RPixDetTrackFinder.h b/RecoPPS/Local/interface/RPixDetTrackFinder.h similarity index 90% rename from RecoCTPPS/PixelLocal/interface/RPixDetTrackFinder.h rename to RecoPPS/Local/interface/RPixDetTrackFinder.h index 4081d99288f0b..558d543a47fa7 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixDetTrackFinder.h +++ b/RecoPPS/Local/interface/RPixDetTrackFinder.h @@ -7,14 +7,14 @@ * Fabio Ravera (fabio.ravera@cern.ch) * */ -#ifndef RecoCTPPS_PixelLocal_RPixDetTrackFinder_H -#define RecoCTPPS_PixelLocal_RPixDetTrackFinder_H +#ifndef RecoPPS_Local_RPixDetTrackFinder_H +#define RecoPPS_Local_RPixDetTrackFinder_H #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" #include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h" +#include "RecoPPS/Local/interface/RPixDetPatternFinder.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" diff --git a/RecoCTPPS/PixelLocal/interface/RPixPlaneCombinatoryTracking.h b/RecoPPS/Local/interface/RPixPlaneCombinatoryTracking.h similarity index 93% rename from RecoCTPPS/PixelLocal/interface/RPixPlaneCombinatoryTracking.h rename to RecoPPS/Local/interface/RPixPlaneCombinatoryTracking.h index 13d4cdc1d1b2b..7f4d1e3aa02ad 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixPlaneCombinatoryTracking.h +++ b/RecoPPS/Local/interface/RPixPlaneCombinatoryTracking.h @@ -7,15 +7,15 @@ * Fabio Ravera (fabio.ravera@cern.ch) * */ -#ifndef RecoCTPPS_PixelLocal_RPixPlaneCombinatoryTracking_H -#define RecoCTPPS_PixelLocal_RPixPlaneCombinatoryTracking_H +#ifndef RecoPPS_Local_RPixPlaneCombinatoryTracking_H +#define RecoPPS_Local_RPixPlaneCombinatoryTracking_H #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetTrackFinder.h" +#include "RecoPPS/Local/interface/RPixDetTrackFinder.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include diff --git a/RecoCTPPS/PixelLocal/interface/RPixRoadFinder.h b/RecoPPS/Local/interface/RPixRoadFinder.h similarity index 87% rename from RecoCTPPS/PixelLocal/interface/RPixRoadFinder.h rename to RecoPPS/Local/interface/RPixRoadFinder.h index 5e022822ca9aa..64e9bf8c53ff0 100644 --- a/RecoCTPPS/PixelLocal/interface/RPixRoadFinder.h +++ b/RecoPPS/Local/interface/RPixRoadFinder.h @@ -7,8 +7,8 @@ * Fabio Ravera (fabio.ravera@cern.ch) * */ -#ifndef RecoCTPPS_PixelLocal_RPixRoadFinder_H -#define RecoCTPPS_PixelLocal_RPixRoadFinder_H +#ifndef RecoPPS_Local_RPixRoadFinder_H +#define RecoPPS_Local_RPixRoadFinder_H #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Common/interface/DetSet.h" @@ -21,8 +21,8 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" -#include "RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h" +#include "RecoPPS/Local/interface/RPixClusterToHit.h" +#include "RecoPPS/Local/interface/RPixDetPatternFinder.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemRPClusterProducerAlgorithm.h b/RecoPPS/Local/interface/TotemRPClusterProducerAlgorithm.h similarity index 88% rename from RecoCTPPS/TotemRPLocal/interface/TotemRPClusterProducerAlgorithm.h rename to RecoPPS/Local/interface/TotemRPClusterProducerAlgorithm.h index 6e5bbfc1827ed..a431f1d5752af 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemRPClusterProducerAlgorithm.h +++ b/RecoPPS/Local/interface/TotemRPClusterProducerAlgorithm.h @@ -7,8 +7,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemRPClusterProducerAlgorithm -#define RecoCTPPS_TotemRPLocal_TotemRPClusterProducerAlgorithm +#ifndef RecoPPS_Local_TotemRPClusterProducerAlgorithm +#define RecoPPS_Local_TotemRPClusterProducerAlgorithm #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemRPLocalTrackFitterAlgorithm.h b/RecoPPS/Local/interface/TotemRPLocalTrackFitterAlgorithm.h similarity index 95% rename from RecoCTPPS/TotemRPLocal/interface/TotemRPLocalTrackFitterAlgorithm.h rename to RecoPPS/Local/interface/TotemRPLocalTrackFitterAlgorithm.h index 4cd2f9ff1bb1e..4aa0bc3942eef 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemRPLocalTrackFitterAlgorithm.h +++ b/RecoPPS/Local/interface/TotemRPLocalTrackFitterAlgorithm.h @@ -7,8 +7,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemRPLocalTrackFitterAlgorithm -#define RecoCTPPS_TotemRPLocal_TotemRPLocalTrackFitterAlgorithm +#ifndef RecoPPS_Local_TotemRPLocalTrackFitterAlgorithm +#define RecoPPS_Local_TotemRPLocalTrackFitterAlgorithm #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemRPRecHitProducerAlgorithm.h b/RecoPPS/Local/interface/TotemRPRecHitProducerAlgorithm.h similarity index 87% rename from RecoCTPPS/TotemRPLocal/interface/TotemRPRecHitProducerAlgorithm.h rename to RecoPPS/Local/interface/TotemRPRecHitProducerAlgorithm.h index eebd211366003..36203a81aceb4 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemRPRecHitProducerAlgorithm.h +++ b/RecoPPS/Local/interface/TotemRPRecHitProducerAlgorithm.h @@ -7,8 +7,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemRPRecHitProducerAlgorithm -#define RecoCTPPS_TotemRPLocal_TotemRPRecHitProducerAlgorithm +#ifndef RecoPPS_Local_TotemRPRecHitProducerAlgorithm +#define RecoPPS_Local_TotemRPRecHitProducerAlgorithm #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemTimingConversions.h b/RecoPPS/Local/interface/TotemTimingConversions.h similarity index 88% rename from RecoCTPPS/TotemRPLocal/interface/TotemTimingConversions.h rename to RecoPPS/Local/interface/TotemTimingConversions.h index 1e398ee09bc9e..28ddc761bbe1f 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemTimingConversions.h +++ b/RecoPPS/Local/interface/TotemTimingConversions.h @@ -8,13 +8,13 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemTimingConversions -#define RecoCTPPS_TotemRPLocal_TotemTimingConversions +#ifndef RecoPPS_Local_TotemTimingConversions +#define RecoPPS_Local_TotemTimingConversions #include "CommonTools/Utils/interface/FormulaEvaluator.h" #include "DataFormats/CTPPSDigi/interface/TotemTimingDigi.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include #include diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemTimingRecHitProducerAlgorithm.h b/RecoPPS/Local/interface/TotemTimingRecHitProducerAlgorithm.h similarity index 87% rename from RecoCTPPS/TotemRPLocal/interface/TotemTimingRecHitProducerAlgorithm.h rename to RecoPPS/Local/interface/TotemTimingRecHitProducerAlgorithm.h index c26d0ba045792..f4bc0de97843f 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemTimingRecHitProducerAlgorithm.h +++ b/RecoPPS/Local/interface/TotemTimingRecHitProducerAlgorithm.h @@ -7,8 +7,8 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemTimingRecHitProducerAlgorithm -#define RecoCTPPS_TotemRPLocal_TotemTimingRecHitProducerAlgorithm +#ifndef RecoPPS_Local_TotemTimingRecHitProducerAlgorithm +#define RecoPPS_Local_TotemTimingRecHitProducerAlgorithm #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -19,9 +19,9 @@ #include "DataFormats/CTPPSReco/interface/TotemTimingRecHit.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingConversions.h" +#include "RecoPPS/Local/interface/TotemTimingConversions.h" #include diff --git a/RecoCTPPS/TotemRPLocal/interface/TotemTimingTrackRecognition.h b/RecoPPS/Local/interface/TotemTimingTrackRecognition.h similarity index 86% rename from RecoCTPPS/TotemRPLocal/interface/TotemTimingTrackRecognition.h rename to RecoPPS/Local/interface/TotemTimingTrackRecognition.h index ae8c130a188cc..748fd7e47a17d 100644 --- a/RecoCTPPS/TotemRPLocal/interface/TotemTimingTrackRecognition.h +++ b/RecoPPS/Local/interface/TotemTimingTrackRecognition.h @@ -8,14 +8,14 @@ * ****************************************************************************/ -#ifndef RecoCTPPS_TotemRPLocal_TotemTimingTrackRecognition -#define RecoCTPPS_TotemRPLocal_TotemTimingTrackRecognition +#ifndef RecoPPS_Local_TotemTimingTrackRecognition +#define RecoPPS_Local_TotemTimingTrackRecognition #include "DataFormats/Common/interface/DetSet.h" #include "DataFormats/CTPPSReco/interface/TotemTimingRecHit.h" #include "DataFormats/CTPPSReco/interface/TotemTimingLocalTrack.h" -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSTimingTrackRecognition.h" +#include "RecoPPS/Local/interface/CTPPSTimingTrackRecognition.h" /** * Class intended to perform general CTPPS timing detectors track recognition, diff --git a/RecoCTPPS/TotemRPLocal/plugins/BuildFile.xml b/RecoPPS/Local/plugins/BuildFile.xml similarity index 74% rename from RecoCTPPS/TotemRPLocal/plugins/BuildFile.xml rename to RecoPPS/Local/plugins/BuildFile.xml index 886d9ef1b47ad..79c45d27cfaad 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/BuildFile.xml +++ b/RecoPPS/Local/plugins/BuildFile.xml @@ -8,12 +8,14 @@ + + + - - - - - + + + + diff --git a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondLocalTrackFitter.cc b/RecoPPS/Local/plugins/CTPPSDiamondLocalTrackFitter.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondLocalTrackFitter.cc rename to RecoPPS/Local/plugins/CTPPSDiamondLocalTrackFitter.cc index 5de9169854fc1..a07904ba9cce7 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondLocalTrackFitter.cc +++ b/RecoPPS/Local/plugins/CTPPSDiamondLocalTrackFitter.cc @@ -23,7 +23,7 @@ #include "DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h" #include "DataFormats/CTPPSReco/interface/CTPPSDiamondLocalTrack.h" -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h" +#include "RecoPPS/Local/interface/CTPPSDiamondTrackRecognition.h" class CTPPSDiamondLocalTrackFitter : public edm::stream::EDProducer<> { public: diff --git a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc b/RecoPPS/Local/plugins/CTPPSDiamondRecHitProducer.cc similarity index 97% rename from RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc rename to RecoPPS/Local/plugins/CTPPSDiamondRecHitProducer.cc index e9cc8064b45f3..6d3c8ba5b2be3 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc +++ b/RecoPPS/Local/plugins/CTPPSDiamondRecHitProducer.cc @@ -26,7 +26,7 @@ #include "DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h" #include "DataFormats/CTPPSReco/interface/CTPPSDiamondRecHit.h" -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/CTPPSDiamondRecHitProducerAlgorithm.h" #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "CondFormats/DataRecord/interface/PPSTimingCalibrationRcd.h" diff --git a/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc b/RecoPPS/Local/plugins/CTPPSLocalTrackLiteProducer.cc similarity index 99% rename from RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc rename to RecoPPS/Local/plugins/CTPPSLocalTrackLiteProducer.cc index 562d8af17b3bf..3ecd94df9c9f3 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc +++ b/RecoPPS/Local/plugins/CTPPSLocalTrackLiteProducer.cc @@ -240,7 +240,7 @@ void CTPPSLocalTrackLiteProducer::fillDescriptions(edm::ConfigurationDescription // By default: all includeXYZ flags set to false. // The includeXYZ are switched on when the "ctpps_2016" era is declared in // python config, see: - // RecoCTPPS/TotemRPLocal/python/ctppsLocalTrackLiteProducer_cff.py + // RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py desc.add("includeStrips", false)->setComment("whether tracks from Si strips should be included"); desc.add("tagSiStripTrack", edm::InputTag("totemRPLocalTrackFitter")) diff --git a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelClusterProducer.cc b/RecoPPS/Local/plugins/CTPPSPixelClusterProducer.cc similarity index 97% rename from RecoCTPPS/PixelLocal/plugins/CTPPSPixelClusterProducer.cc rename to RecoPPS/Local/plugins/CTPPSPixelClusterProducer.cc index c6168876fb6fb..a8ec6f1e91b34 100644 --- a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelClusterProducer.cc +++ b/RecoPPS/Local/plugins/CTPPSPixelClusterProducer.cc @@ -1,6 +1,6 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelClusterProducer.h" +#include "RecoPPS/Local/interface/CTPPSPixelClusterProducer.h" CTPPSPixelClusterProducer::CTPPSPixelClusterProducer(const edm::ParameterSet &conf) : param_(conf), clusterizer_(conf) { src_ = conf.getParameter("label"); diff --git a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelLocalTrackProducer.cc b/RecoPPS/Local/plugins/CTPPSPixelLocalTrackProducer.cc similarity index 97% rename from RecoCTPPS/PixelLocal/plugins/CTPPSPixelLocalTrackProducer.cc rename to RecoPPS/Local/plugins/CTPPSPixelLocalTrackProducer.cc index f879606b09c06..aee9b694cda4d 100644 --- a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelLocalTrackProducer.cc +++ b/RecoPPS/Local/plugins/CTPPSPixelLocalTrackProducer.cc @@ -20,8 +20,8 @@ #include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h" #include "DataFormats/DetId/interface/DetId.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetPatternFinder.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetTrackFinder.h" +#include "RecoPPS/Local/interface/RPixDetPatternFinder.h" +#include "RecoPPS/Local/interface/RPixDetTrackFinder.h" #include #include @@ -32,8 +32,8 @@ #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" -#include "RecoCTPPS/PixelLocal/interface/RPixRoadFinder.h" -#include "RecoCTPPS/PixelLocal/interface/RPixPlaneCombinatoryTracking.h" +#include "RecoPPS/Local/interface/RPixRoadFinder.h" +#include "RecoPPS/Local/interface/RPixPlaneCombinatoryTracking.h" class CTPPSPixelLocalTrackProducer : public edm::stream::EDProducer<> { public: diff --git a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelRecHitProducer.cc b/RecoPPS/Local/plugins/CTPPSPixelRecHitProducer.cc similarity index 95% rename from RecoCTPPS/PixelLocal/plugins/CTPPSPixelRecHitProducer.cc rename to RecoPPS/Local/plugins/CTPPSPixelRecHitProducer.cc index b61fdf4041adb..537756cd9f755 100644 --- a/RecoCTPPS/PixelLocal/plugins/CTPPSPixelRecHitProducer.cc +++ b/RecoPPS/Local/plugins/CTPPSPixelRecHitProducer.cc @@ -1,4 +1,4 @@ -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelRecHitProducer.h" +#include "RecoPPS/Local/interface/CTPPSPixelRecHitProducer.h" CTPPSPixelRecHitProducer::CTPPSPixelRecHitProducer(const edm::ParameterSet &conf) : param_(conf), cluster2hit_(conf) { src_ = conf.getParameter("RPixClusterTag"); diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemRPClusterProducer.cc b/RecoPPS/Local/plugins/TotemRPClusterProducer.cc similarity index 97% rename from RecoCTPPS/TotemRPLocal/plugins/TotemRPClusterProducer.cc rename to RecoPPS/Local/plugins/TotemRPClusterProducer.cc index 53699c86df738..9bb312467ecde 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemRPClusterProducer.cc +++ b/RecoPPS/Local/plugins/TotemRPClusterProducer.cc @@ -18,7 +18,7 @@ #include "DataFormats/Common/interface/DetSet.h" #include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPClusterProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPClusterProducerAlgorithm.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemRPLocalTrackFitter.cc b/RecoPPS/Local/plugins/TotemRPLocalTrackFitter.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/plugins/TotemRPLocalTrackFitter.cc rename to RecoPPS/Local/plugins/TotemRPLocalTrackFitter.cc index df6370002fac1..ac9da4ea9dff8 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemRPLocalTrackFitter.cc +++ b/RecoPPS/Local/plugins/TotemRPLocalTrackFitter.cc @@ -24,7 +24,7 @@ #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPLocalTrackFitterAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPLocalTrackFitterAlgorithm.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemRPRecHitProducer.cc b/RecoPPS/Local/plugins/TotemRPRecHitProducer.cc similarity index 97% rename from RecoCTPPS/TotemRPLocal/plugins/TotemRPRecHitProducer.cc rename to RecoPPS/Local/plugins/TotemRPRecHitProducer.cc index 57278202da545..88e3ee945b284 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemRPRecHitProducer.cc +++ b/RecoPPS/Local/plugins/TotemRPRecHitProducer.cc @@ -19,7 +19,7 @@ #include "DataFormats/CTPPSReco/interface/TotemRPCluster.h" #include "DataFormats/CTPPSReco/interface/TotemRPRecHit.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPRecHitProducerAlgorithm.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemRPUVPatternFinder.cc b/RecoPPS/Local/plugins/TotemRPUVPatternFinder.cc similarity index 99% rename from RecoCTPPS/TotemRPLocal/plugins/TotemRPUVPatternFinder.cc rename to RecoPPS/Local/plugins/TotemRPUVPatternFinder.cc index a4353a5df7832..e994a54b4f6e5 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemRPUVPatternFinder.cc +++ b/RecoPPS/Local/plugins/TotemRPUVPatternFinder.cc @@ -23,7 +23,7 @@ #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" -#include "RecoCTPPS/TotemRPLocal/interface/FastLineRecognition.h" +#include "RecoPPS/Local/interface/FastLineRecognition.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingLocalTrackFitter.cc b/RecoPPS/Local/plugins/TotemTimingLocalTrackFitter.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/plugins/TotemTimingLocalTrackFitter.cc rename to RecoPPS/Local/plugins/TotemTimingLocalTrackFitter.cc index a8c7eb4844fa0..f6c8740eb18d2 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingLocalTrackFitter.cc +++ b/RecoPPS/Local/plugins/TotemTimingLocalTrackFitter.cc @@ -25,7 +25,7 @@ #include "DataFormats/CTPPSReco/interface/TotemTimingRecHit.h" #include "DataFormats/CTPPSReco/interface/TotemTimingLocalTrack.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingTrackRecognition.h" +#include "RecoPPS/Local/interface/TotemTimingTrackRecognition.h" class TotemTimingLocalTrackFitter : public edm::stream::EDProducer<> { public: diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc b/RecoPPS/Local/plugins/TotemTimingRecHitProducer.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc rename to RecoPPS/Local/plugins/TotemTimingRecHitProducer.cc index 8e3532ddb18a3..d5831f6af4fbb 100644 --- a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc +++ b/RecoPPS/Local/plugins/TotemTimingRecHitProducer.cc @@ -26,7 +26,7 @@ #include "DataFormats/CTPPSDigi/interface/TotemTimingDigi.h" #include "DataFormats/CTPPSReco/interface/TotemTimingRecHit.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemTimingRecHitProducerAlgorithm.h" #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" diff --git a/RecoCTPPS/TotemRPLocal/python/PPSTimingCalibrationModeEnum_cff.py b/RecoPPS/Local/python/PPSTimingCalibrationModeEnum_cff.py similarity index 100% rename from RecoCTPPS/TotemRPLocal/python/PPSTimingCalibrationModeEnum_cff.py rename to RecoPPS/Local/python/PPSTimingCalibrationModeEnum_cff.py diff --git a/RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py b/RecoPPS/Local/python/ctppsDiamondLocalReconstruction_cff.py similarity index 62% rename from RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py rename to RecoPPS/Local/python/ctppsDiamondLocalReconstruction_cff.py index b17cd18f76260..754420bf10ce8 100644 --- a/RecoCTPPS/TotemRPLocal/python/ctppsDiamondLocalReconstruction_cff.py +++ b/RecoPPS/Local/python/ctppsDiamondLocalReconstruction_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms # reco hit production -from RecoCTPPS.TotemRPLocal.ctppsDiamondRecHits_cfi import ctppsDiamondRecHits +from RecoPPS.Local.ctppsDiamondRecHits_cfi import ctppsDiamondRecHits # local track fitting -from RecoCTPPS.TotemRPLocal.ctppsDiamondLocalTracks_cfi import ctppsDiamondLocalTracks +from RecoPPS.Local.ctppsDiamondLocalTracks_cfi import ctppsDiamondLocalTracks ctppsDiamondLocalReconstructionTask = cms.Task( ctppsDiamondRecHits, diff --git a/RecoCTPPS/TotemRPLocal/python/ctppsLocalTrackLiteProducer_cff.py b/RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py similarity index 82% rename from RecoCTPPS/TotemRPLocal/python/ctppsLocalTrackLiteProducer_cff.py rename to RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py index 892ef77aae739..f40ccec3b789c 100644 --- a/RecoCTPPS/TotemRPLocal/python/ctppsLocalTrackLiteProducer_cff.py +++ b/RecoPPS/Local/python/ctppsLocalTrackLiteProducer_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from RecoCTPPS.TotemRPLocal.ctppsLocalTrackLiteDefaultProducer_cfi import ctppsLocalTrackLiteDefaultProducer +from RecoPPS.Local.ctppsLocalTrackLiteDefaultProducer_cfi import ctppsLocalTrackLiteDefaultProducer ctppsLocalTrackLiteProducer = ctppsLocalTrackLiteDefaultProducer.clone() diff --git a/RecoCTPPS/PixelLocal/python/ctppsPixelLocalReconstruction_cff.py b/RecoPPS/Local/python/ctppsPixelLocalReconstruction_cff.py similarity index 56% rename from RecoCTPPS/PixelLocal/python/ctppsPixelLocalReconstruction_cff.py rename to RecoPPS/Local/python/ctppsPixelLocalReconstruction_cff.py index 348e98db107aa..239b7aa4cae95 100644 --- a/RecoCTPPS/PixelLocal/python/ctppsPixelLocalReconstruction_cff.py +++ b/RecoPPS/Local/python/ctppsPixelLocalReconstruction_cff.py @@ -1,13 +1,13 @@ import FWCore.ParameterSet.Config as cms # local clusterizer -from RecoCTPPS.PixelLocal.ctppsPixelClusters_cfi import ctppsPixelClusters +from RecoPPS.Local.ctppsPixelClusters_cfi import ctppsPixelClusters # local rechit producer -from RecoCTPPS.PixelLocal.ctppsPixelRecHits_cfi import ctppsPixelRecHits +from RecoPPS.Local.ctppsPixelRecHits_cfi import ctppsPixelRecHits # local track producer -from RecoCTPPS.PixelLocal.ctppsPixelLocalTracks_cfi import ctppsPixelLocalTracks +from RecoPPS.Local.ctppsPixelLocalTracks_cfi import ctppsPixelLocalTracks ctppsPixelLocalReconstructionTask = cms.Task( ctppsPixelClusters,ctppsPixelRecHits,ctppsPixelLocalTracks diff --git a/RecoCTPPS/TotemRPLocal/python/totemRPLocalReconstruction_cff.py b/RecoPPS/Local/python/totemRPLocalReconstruction_cff.py similarity index 59% rename from RecoCTPPS/TotemRPLocal/python/totemRPLocalReconstruction_cff.py rename to RecoPPS/Local/python/totemRPLocalReconstruction_cff.py index f8491569c951b..3723b5d1313c0 100644 --- a/RecoCTPPS/TotemRPLocal/python/totemRPLocalReconstruction_cff.py +++ b/RecoPPS/Local/python/totemRPLocalReconstruction_cff.py @@ -1,16 +1,16 @@ import FWCore.ParameterSet.Config as cms # clusterization -from RecoCTPPS.TotemRPLocal.totemRPClusterProducer_cfi import * +from RecoPPS.Local.totemRPClusterProducer_cfi import * # reco hit production -from RecoCTPPS.TotemRPLocal.totemRPRecHitProducer_cfi import * +from RecoPPS.Local.totemRPRecHitProducer_cfi import * # non-parallel pattern recognition -from RecoCTPPS.TotemRPLocal.totemRPUVPatternFinder_cfi import * +from RecoPPS.Local.totemRPUVPatternFinder_cfi import * # local track fitting -from RecoCTPPS.TotemRPLocal.totemRPLocalTrackFitter_cfi import * +from RecoPPS.Local.totemRPLocalTrackFitter_cfi import * totemRPLocalReconstructionTask = cms.Task( totemRPClusterProducer , diff --git a/RecoCTPPS/TotemRPLocal/python/totemTimingLocalReconstruction_cff.py b/RecoPPS/Local/python/totemTimingLocalReconstruction_cff.py similarity index 62% rename from RecoCTPPS/TotemRPLocal/python/totemTimingLocalReconstruction_cff.py rename to RecoPPS/Local/python/totemTimingLocalReconstruction_cff.py index 4536fa219c67f..de6708fb29376 100644 --- a/RecoCTPPS/TotemRPLocal/python/totemTimingLocalReconstruction_cff.py +++ b/RecoPPS/Local/python/totemTimingLocalReconstruction_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms # reco hit production -from RecoCTPPS.TotemRPLocal.totemTimingRecHits_cfi import totemTimingRecHits +from RecoPPS.Local.totemTimingRecHits_cfi import totemTimingRecHits # local track fitting -from RecoCTPPS.TotemRPLocal.totemTimingLocalTracks_cfi import totemTimingLocalTracks +from RecoPPS.Local.totemTimingLocalTracks_cfi import totemTimingLocalTracks totemTimingLocalReconstructionTask = cms.Task( totemTimingRecHits , diff --git a/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondRecHitProducerAlgorithm.cc b/RecoPPS/Local/src/CTPPSDiamondRecHitProducerAlgorithm.cc similarity index 97% rename from RecoCTPPS/TotemRPLocal/src/CTPPSDiamondRecHitProducerAlgorithm.cc rename to RecoPPS/Local/src/CTPPSDiamondRecHitProducerAlgorithm.cc index 7fad2be1d4283..2f4d87225e6ec 100644 --- a/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondRecHitProducerAlgorithm.cc +++ b/RecoPPS/Local/src/CTPPSDiamondRecHitProducerAlgorithm.cc @@ -6,7 +6,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/CTPPSDiamondRecHitProducerAlgorithm.h" #include "FWCore/Utilities/interface/isFinite.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondTrackRecognition.cc b/RecoPPS/Local/src/CTPPSDiamondTrackRecognition.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/src/CTPPSDiamondTrackRecognition.cc rename to RecoPPS/Local/src/CTPPSDiamondTrackRecognition.cc index 779ee229c59a0..eff200317df80 100644 --- a/RecoCTPPS/TotemRPLocal/src/CTPPSDiamondTrackRecognition.cc +++ b/RecoPPS/Local/src/CTPPSDiamondTrackRecognition.cc @@ -8,7 +8,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/CTPPSDiamondTrackRecognition.h" +#include "RecoPPS/Local/interface/CTPPSDiamondTrackRecognition.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/PixelLocal/src/CTPPSPixelGainCalibrationDBService.cc b/RecoPPS/Local/src/CTPPSPixelGainCalibrationDBService.cc similarity index 86% rename from RecoCTPPS/PixelLocal/src/CTPPSPixelGainCalibrationDBService.cc rename to RecoPPS/Local/src/CTPPSPixelGainCalibrationDBService.cc index 9a1fe6f612cca..c894b833e1f4c 100644 --- a/RecoCTPPS/PixelLocal/src/CTPPSPixelGainCalibrationDBService.cc +++ b/RecoPPS/Local/src/CTPPSPixelGainCalibrationDBService.cc @@ -1,6 +1,6 @@ // -*- C++ -*- // -// Package: RecoCTPPS/PixelLocal +// Package: RecoPPS/Local // Class : CTPPSPixelGainCalibrationDBService // // Implementation: @@ -10,12 +10,12 @@ // Created: Thu, 23 Feb 2017 17:37:50 GMT // -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "CondFormats/DataRecord/interface/CTPPSPixelGainCalibrationsRcd.h" CTPPSPixelGainCalibrationDBService::CTPPSPixelGainCalibrationDBService() {} diff --git a/RecoCTPPS/TotemRPLocal/src/FastLineRecognition.cc b/RecoPPS/Local/src/FastLineRecognition.cc similarity index 99% rename from RecoCTPPS/TotemRPLocal/src/FastLineRecognition.cc rename to RecoPPS/Local/src/FastLineRecognition.cc index 4e7786a62fa1d..2d4de30b8403c 100644 --- a/RecoCTPPS/TotemRPLocal/src/FastLineRecognition.cc +++ b/RecoPPS/Local/src/FastLineRecognition.cc @@ -6,7 +6,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/FastLineRecognition.h" +#include "RecoPPS/Local/interface/FastLineRecognition.h" #include "DataFormats/CTPPSReco/interface/TotemRPRecHit.h" diff --git a/RecoCTPPS/PixelLocal/src/RPixClusterToHit.cc b/RecoPPS/Local/src/RPixClusterToHit.cc similarity index 98% rename from RecoCTPPS/PixelLocal/src/RPixClusterToHit.cc rename to RecoPPS/Local/src/RPixClusterToHit.cc index 4e6946d5e6b02..80e50441e0cbe 100644 --- a/RecoCTPPS/PixelLocal/src/RPixClusterToHit.cc +++ b/RecoPPS/Local/src/RPixClusterToHit.cc @@ -1,4 +1,4 @@ -#include "RecoCTPPS/PixelLocal/interface/RPixClusterToHit.h" +#include "RecoPPS/Local/interface/RPixClusterToHit.h" RPixClusterToHit::RPixClusterToHit(edm::ParameterSet const &conf) { verbosity_ = conf.getUntrackedParameter("RPixVerbosity"); diff --git a/RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc b/RecoPPS/Local/src/RPixDetClusterizer.cc similarity index 99% rename from RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc rename to RecoPPS/Local/src/RPixDetClusterizer.cc index 0202f646a83d8..1334ef0d84fb7 100644 --- a/RecoCTPPS/PixelLocal/src/RPixDetClusterizer.cc +++ b/RecoPPS/Local/src/RPixDetClusterizer.cc @@ -1,7 +1,7 @@ #include #include "FWCore/Utilities/interface/Exception.h" -#include "RecoCTPPS/PixelLocal/interface/RPixDetClusterizer.h" +#include "RecoPPS/Local/interface/RPixDetClusterizer.h" namespace { constexpr int maxCol = CTPPSPixelCluster::MAXCOL; diff --git a/RecoCTPPS/PixelLocal/src/RPixPlaneCombinatoryTracking.cc b/RecoPPS/Local/src/RPixPlaneCombinatoryTracking.cc similarity index 99% rename from RecoCTPPS/PixelLocal/src/RPixPlaneCombinatoryTracking.cc rename to RecoPPS/Local/src/RPixPlaneCombinatoryTracking.cc index 8cfbba2fbadd2..b24ebfa83a2d0 100644 --- a/RecoCTPPS/PixelLocal/src/RPixPlaneCombinatoryTracking.cc +++ b/RecoPPS/Local/src/RPixPlaneCombinatoryTracking.cc @@ -1,4 +1,4 @@ -#include "RecoCTPPS/PixelLocal/interface/RPixPlaneCombinatoryTracking.h" +#include "RecoPPS/Local/interface/RPixPlaneCombinatoryTracking.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include @@ -6,7 +6,7 @@ #include "DataFormats/Math/interface/Error.h" #include "DataFormats/Math/interface/AlgebraicROOTObjects.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" #include "TMath.h" #include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrackRecoInfo.h" diff --git a/RecoCTPPS/PixelLocal/src/RPixRoadFinder.cc b/RecoPPS/Local/src/RPixRoadFinder.cc similarity index 98% rename from RecoCTPPS/PixelLocal/src/RPixRoadFinder.cc rename to RecoPPS/Local/src/RPixRoadFinder.cc index be4133d696ab3..e8a223646a7ec 100644 --- a/RecoCTPPS/PixelLocal/src/RPixRoadFinder.cc +++ b/RecoPPS/Local/src/RPixRoadFinder.cc @@ -1,5 +1,5 @@ -#include "RecoCTPPS/PixelLocal/interface/RPixRoadFinder.h" +#include "RecoPPS/Local/interface/RPixRoadFinder.h" // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" diff --git a/RecoCTPPS/TotemRPLocal/src/TotemRPClusterProducerAlgorithm.cc b/RecoPPS/Local/src/TotemRPClusterProducerAlgorithm.cc similarity index 96% rename from RecoCTPPS/TotemRPLocal/src/TotemRPClusterProducerAlgorithm.cc rename to RecoPPS/Local/src/TotemRPClusterProducerAlgorithm.cc index cc4b091d65b75..90653fb9eb9bc 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemRPClusterProducerAlgorithm.cc +++ b/RecoPPS/Local/src/TotemRPClusterProducerAlgorithm.cc @@ -7,7 +7,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPClusterProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPClusterProducerAlgorithm.h" #include diff --git a/RecoCTPPS/TotemRPLocal/src/TotemRPLocalTrackFitterAlgorithm.cc b/RecoPPS/Local/src/TotemRPLocalTrackFitterAlgorithm.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/src/TotemRPLocalTrackFitterAlgorithm.cc rename to RecoPPS/Local/src/TotemRPLocalTrackFitterAlgorithm.cc index dddacf39464d3..c0e65af7e12a0 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemRPLocalTrackFitterAlgorithm.cc +++ b/RecoPPS/Local/src/TotemRPLocalTrackFitterAlgorithm.cc @@ -7,7 +7,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPLocalTrackFitterAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPLocalTrackFitterAlgorithm.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/RecoCTPPS/TotemRPLocal/src/TotemRPRecHitProducerAlgorithm.cc b/RecoPPS/Local/src/TotemRPRecHitProducerAlgorithm.cc similarity index 91% rename from RecoCTPPS/TotemRPLocal/src/TotemRPRecHitProducerAlgorithm.cc rename to RecoPPS/Local/src/TotemRPRecHitProducerAlgorithm.cc index e0c08f738bcaf..ed131d2ead881 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemRPRecHitProducerAlgorithm.cc +++ b/RecoPPS/Local/src/TotemRPRecHitProducerAlgorithm.cc @@ -7,7 +7,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/TotemRPRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemRPRecHitProducerAlgorithm.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingConversions.cc b/RecoPPS/Local/src/TotemTimingConversions.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/src/TotemTimingConversions.cc rename to RecoPPS/Local/src/TotemTimingConversions.cc index e5a212cf66603..e3a5258e91a30 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemTimingConversions.cc +++ b/RecoPPS/Local/src/TotemTimingConversions.cc @@ -8,7 +8,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingConversions.h" +#include "RecoPPS/Local/interface/TotemTimingConversions.h" #include "FWCore/Utilities/interface/Exception.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc b/RecoPPS/Local/src/TotemTimingRecHitProducerAlgorithm.cc similarity index 99% rename from RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc rename to RecoPPS/Local/src/TotemTimingRecHitProducerAlgorithm.cc index 9a8eb948133a3..3cee4fe4afd09 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc +++ b/RecoPPS/Local/src/TotemTimingRecHitProducerAlgorithm.cc @@ -9,7 +9,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingRecHitProducerAlgorithm.h" +#include "RecoPPS/Local/interface/TotemTimingRecHitProducerAlgorithm.h" #include diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingTrackRecognition.cc b/RecoPPS/Local/src/TotemTimingTrackRecognition.cc similarity index 98% rename from RecoCTPPS/TotemRPLocal/src/TotemTimingTrackRecognition.cc rename to RecoPPS/Local/src/TotemTimingTrackRecognition.cc index 2035f349a6d98..c131e511f8447 100644 --- a/RecoCTPPS/TotemRPLocal/src/TotemTimingTrackRecognition.cc +++ b/RecoPPS/Local/src/TotemTimingTrackRecognition.cc @@ -8,7 +8,7 @@ * ****************************************************************************/ -#include "RecoCTPPS/TotemRPLocal/interface/TotemTimingTrackRecognition.h" +#include "RecoPPS/Local/interface/TotemTimingTrackRecognition.h" //---------------------------------------------------------------------------------------------------- diff --git a/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py b/RecoPPS/Local/test/_aa_real_ALL_GT_2.py similarity index 96% rename from RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py rename to RecoPPS/Local/test/_aa_real_ALL_GT_2.py index 27319cf158573..7f169492852e1 100644 --- a/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py +++ b/RecoPPS/Local/test/_aa_real_ALL_GT_2.py @@ -21,7 +21,7 @@ ############### using only CTPPS geometry ##process.load("Configuration.Geometry.geometry_CTPPS_2018_cfi") ##process.load("Geometry.VeryForwardGeometry.geometryRP_2017_cfi") -#process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +#process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) @@ -56,8 +56,8 @@ #from Geometry.VeryForwardGeometry.geometryRP_cfi import * -from RecoCTPPS.Configuration.recoCTPPS_DB_cff import * -process.load("RecoCTPPS.Configuration.recoCTPPS_DB_cff") +from RecoPPS.Configuration.recoCTPPS_DB_cff import * +process.load("RecoPPS.Configuration.recoCTPPS_DB_cff") # Output definition process.o1 = cms.OutputModule("PoolOutputModule", diff --git a/RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py b/RecoPPS/Local/test/diamonds_reco_cfg.py similarity index 86% rename from RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py rename to RecoPPS/Local/test/diamonds_reco_cfg.py index 2947dd573ff5f..ef62cc83e9328 100644 --- a/RecoCTPPS/TotemRPLocal/test/diamonds_reco_cfg.py +++ b/RecoPPS/Local/test/diamonds_reco_cfg.py @@ -2,7 +2,7 @@ process = cms.Process('CTPPS') -from RecoCTPPS.TotemRPLocal.PPSTimingCalibrationModeEnum_cff import PPSTimingCalibrationModeEnum +from RecoPPS.Local.PPSTimingCalibrationModeEnum_cff import PPSTimingCalibrationModeEnum calibrationMode = PPSTimingCalibrationModeEnum.CondDB # import of standard configurations @@ -15,8 +15,8 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_relval', '') if calibrationMode == PPSTimingCalibrationModeEnum.JSON: - process.load('CondFormats.CTPPSReadoutObjects.ppsTimingCalibrationESSource_cfi') - process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoCTPPS/TotemRPLocal/data/timing_offsets_ufsd_2018.dec18.cal.json') + process.load('CondFormats.PPSObjects.ppsTimingCalibrationESSource_cfi') + process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoPPS/Local/data/timing_offsets_ufsd_2018.dec18.cal.json') elif calibrationMode == PPSTimingCalibrationModeEnum.SQLite: # load calibrations from database process.load('CondCore.CondDB.CondDB_cfi') @@ -56,14 +56,14 @@ process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") # local RP reconstruction chain with standard settings -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") # rechits production process.load('Geometry.VeryForwardGeometry.geometryRPFromDD_2018_cfi') -process.load('RecoCTPPS.TotemRPLocal.ctppsDiamondRecHits_cfi') +process.load('RecoPPS.Local.ctppsDiamondRecHits_cfi') # local tracks fitter -process.load('RecoCTPPS.TotemRPLocal.ctppsDiamondLocalTracks_cfi') +process.load('RecoPPS.Local.ctppsDiamondLocalTracks_cfi') process.output = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("file:AOD.root"), diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py similarity index 97% rename from RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py rename to RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py index 063614ded72ba..c65a9af2f1c01 100644 --- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py +++ b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py @@ -53,7 +53,7 @@ fileName = cms.untracked.string('simevent_CTPPS_CLU_DB_real_mem.root') ) -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") process.ALL = cms.Path(process.recoCTPPS) diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py similarity index 94% rename from RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py rename to RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py index 43f8b484416d3..a51e45db1e5ee 100644 --- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py +++ b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py @@ -11,7 +11,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +#process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000) @@ -47,14 +47,14 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_relval', '') -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") #process.patternProd = cms.EDProducer("patternProducer", # label=cms.untracked.string("ctppsPixelRecHits"), # RPixVerbosity = cms.untracked.int32(2) #) -#process.load("RecoCTPPS.PixelLocal.patternProd_cfi") +#process.load("RecoPPS.Local.patternProd_cfi") #process.patternProd.RPixVerbosity = cms.untracked.int32(0) ############ diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py similarity index 97% rename from RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py rename to RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py index 6461f48911d12..7601a21caaefd 100644 --- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py +++ b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py @@ -54,7 +54,7 @@ fileName = cms.untracked.string('simevent_CTPPS_CLU_REC_DB_real_mem.root') ) -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") process.ALL = cms.Path(process.recoCTPPS) diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py similarity index 95% rename from RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py rename to RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py index bc145ed939fad..1ab8568dc67f9 100644 --- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py +++ b/RecoPPS/Local/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py @@ -11,7 +11,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +#process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1000) @@ -49,7 +49,7 @@ # raw-to-digi conversion process.load("EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff") -process.load("RecoCTPPS.Configuration.recoCTPPS_cff") +process.load("RecoPPS.Configuration.recoCTPPS_cff") ############ diff --git a/RecoCTPPS/TotemRPLocal/test/totemTiming_reco_cfg.py b/RecoPPS/Local/test/totemTiming_reco_cfg.py similarity index 87% rename from RecoCTPPS/TotemRPLocal/test/totemTiming_reco_cfg.py rename to RecoPPS/Local/test/totemTiming_reco_cfg.py index 2bda9f851a438..07f283dec4e09 100644 --- a/RecoCTPPS/TotemRPLocal/test/totemTiming_reco_cfg.py +++ b/RecoPPS/Local/test/totemTiming_reco_cfg.py @@ -2,7 +2,7 @@ process = cms.Process('CTPPS') -from RecoCTPPS.TotemRPLocal.PPSTimingCalibrationModeEnum_cff import PPSTimingCalibrationModeEnum +from RecoPPS.Local.PPSTimingCalibrationModeEnum_cff import PPSTimingCalibrationModeEnum calibrationMode = PPSTimingCalibrationModeEnum.CondDB # import of standard configurations @@ -15,8 +15,8 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') if calibrationMode == PPSTimingCalibrationModeEnum.JSON: - process.load('CondFormats.CTPPSReadoutObjects.ppsTimingCalibrationESSource_cfi') - process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoCTPPS/TotemRPLocal/data/timing_offsets_ufsd_2018.dec18.cal.json') + process.load('CondFormats.PPSObjects.ppsTimingCalibrationESSource_cfi') + process.ppsTimingCalibrationESSource.calibrationFile = cms.FileInPath('RecoPPS/Local/data/timing_offsets_ufsd_2018.dec18.cal.json') elif calibrationMode == PPSTimingCalibrationModeEnum.SQLite: # load calibrations from database process.load('CondCore.CondDB.CondDB_cfi') @@ -54,7 +54,7 @@ # rechits production process.load('Geometry.VeryForwardGeometry.geometryRPFromDD_2018_cfi') -process.load('RecoCTPPS.TotemRPLocal.totemTimingLocalReconstruction_cff') +process.load('RecoPPS.Local.totemTimingLocalReconstruction_cff') process.output = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("file:AOD.root"), diff --git a/RecoCTPPS/ProtonReconstruction/BuildFile.xml b/RecoPPS/ProtonReconstruction/BuildFile.xml similarity index 83% rename from RecoCTPPS/ProtonReconstruction/BuildFile.xml rename to RecoPPS/ProtonReconstruction/BuildFile.xml index 53eae998e7499..54bdd0dc58d46 100644 --- a/RecoCTPPS/ProtonReconstruction/BuildFile.xml +++ b/RecoPPS/ProtonReconstruction/BuildFile.xml @@ -7,8 +7,7 @@ - - + diff --git a/RecoCTPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h b/RecoPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h similarity index 90% rename from RecoCTPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h rename to RecoPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h index 40af38d279652..dcdad26c8d629 100644 --- a/RecoCTPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h +++ b/RecoPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h @@ -4,8 +4,8 @@ * Laurent Forthomme ****************************************************************************/ -#ifndef RecoCTPPS_ProtonReconstruction_ProtonReconstructionAlgorithm_h -#define RecoCTPPS_ProtonReconstruction_ProtonReconstructionAlgorithm_h +#ifndef RecoPPS_ProtonReconstruction_ProtonReconstructionAlgorithm_h +#define RecoPPS_ProtonReconstruction_ProtonReconstructionAlgorithm_h #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -13,8 +13,8 @@ #include "DataFormats/ProtonReco/interface/ForwardProtonFwd.h" #include "CondFormats/RunInfo/interface/LHCInfo.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSet.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "TSpline.h" #include "Fit/Fitter.h" diff --git a/RecoCTPPS/ProtonReconstruction/plugins/BuildFile.xml b/RecoPPS/ProtonReconstruction/plugins/BuildFile.xml similarity index 83% rename from RecoCTPPS/ProtonReconstruction/plugins/BuildFile.xml rename to RecoPPS/ProtonReconstruction/plugins/BuildFile.xml index e2b6deabaef46..a3816de93cf79 100644 --- a/RecoCTPPS/ProtonReconstruction/plugins/BuildFile.xml +++ b/RecoPPS/ProtonReconstruction/plugins/BuildFile.xml @@ -3,7 +3,7 @@ - + diff --git a/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc b/RecoPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc similarity index 99% rename from RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc rename to RecoPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc index eb80fe35cdd00..953f0caa26ba9 100644 --- a/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc +++ b/RecoPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc @@ -19,13 +19,13 @@ #include "DataFormats/ProtonReco/interface/ForwardProton.h" #include "DataFormats/ProtonReco/interface/ForwardProtonFwd.h" -#include "RecoCTPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h" +#include "RecoPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h" #include "CondFormats/RunInfo/interface/LHCInfo.h" #include "CondFormats/DataRecord/interface/LHCInfoRcd.h" #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" diff --git a/RecoCTPPS/ProtonReconstruction/python/ctppsProtons_cff.py b/RecoPPS/ProtonReconstruction/python/ctppsProtons_cff.py similarity index 96% rename from RecoCTPPS/ProtonReconstruction/python/ctppsProtons_cff.py rename to RecoPPS/ProtonReconstruction/python/ctppsProtons_cff.py index c67cd87471496..6dd251723c601 100644 --- a/RecoCTPPS/ProtonReconstruction/python/ctppsProtons_cff.py +++ b/RecoPPS/ProtonReconstruction/python/ctppsProtons_cff.py @@ -7,7 +7,7 @@ from CalibPPS.ESProducers.ctppsOpticalFunctions_cff import * # import and adjust proton-reconstructions settings -from RecoCTPPS.ProtonReconstruction.ctppsProtons_cfi import * +from RecoPPS.ProtonReconstruction.ctppsProtons_cfi import * ctppsProtons.lhcInfoLabel = ctppsLHCInfoLabel from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 diff --git a/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc b/RecoPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc similarity index 99% rename from RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc rename to RecoPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc index fdbc9cba1f2d7..7af961a039085 100644 --- a/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc +++ b/RecoPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc @@ -4,7 +4,7 @@ * Laurent Forthomme ****************************************************************************/ -#include "RecoCTPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h" +#include "RecoPPS/ProtonReconstruction/interface/ProtonReconstructionAlgorithm.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/Validation/CTPPS/plugins/BuildFile.xml b/Validation/CTPPS/plugins/BuildFile.xml index 7634b7d030415..b9de7840536f6 100644 --- a/Validation/CTPPS/plugins/BuildFile.xml +++ b/Validation/CTPPS/plugins/BuildFile.xml @@ -1,6 +1,6 @@ - + diff --git a/Validation/CTPPS/plugins/CTPPSDirectProtonSimulation.cc b/Validation/CTPPS/plugins/CTPPSDirectProtonSimulation.cc index b94fd951b7096..4f53821b2906d 100644 --- a/Validation/CTPPS/plugins/CTPPSDirectProtonSimulation.cc +++ b/Validation/CTPPS/plugins/CTPPSDirectProtonSimulation.cc @@ -25,9 +25,9 @@ #include "DataFormats/CTPPSReco/interface/CTPPSLocalTrackLite.h" #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" #include "CondFormats/RunInfo/interface/LHCInfo.h" diff --git a/Validation/CTPPS/plugins/CTPPSModifiedOpticalFunctionsESSource.cc b/Validation/CTPPS/plugins/CTPPSModifiedOpticalFunctionsESSource.cc index 411cf40e5eb64..e69f67f8858be 100644 --- a/Validation/CTPPS/plugins/CTPPSModifiedOpticalFunctionsESSource.cc +++ b/Validation/CTPPS/plugins/CTPPSModifiedOpticalFunctionsESSource.cc @@ -9,7 +9,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" diff --git a/Validation/CTPPS/plugins/CTPPSOpticsPlotter.cc b/Validation/CTPPS/plugins/CTPPSOpticsPlotter.cc index 0cb26773a3968..a4a37399e1573 100644 --- a/Validation/CTPPS/plugins/CTPPSOpticsPlotter.cc +++ b/Validation/CTPPS/plugins/CTPPSOpticsPlotter.cc @@ -14,7 +14,7 @@ #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "TFile.h" #include "TGraph.h" diff --git a/Validation/CTPPS/plugins/CTPPSProtonReconstructionValidator.cc b/Validation/CTPPS/plugins/CTPPSProtonReconstructionValidator.cc index a410c29f1dc69..a7337b1eb336f 100644 --- a/Validation/CTPPS/plugins/CTPPSProtonReconstructionValidator.cc +++ b/Validation/CTPPS/plugins/CTPPSProtonReconstructionValidator.cc @@ -15,7 +15,7 @@ #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h" #include "CondFormats/DataRecord/interface/CTPPSInterpolatedOpticsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h" #include "DataFormats/ProtonReco/interface/ForwardProton.h" #include "DataFormats/ProtonReco/interface/ForwardProtonFwd.h" diff --git a/Validation/CTPPS/python/simu_config/base_cff.py b/Validation/CTPPS/python/simu_config/base_cff.py index 4daf80e51d92b..4486bad56a612 100644 --- a/Validation/CTPPS/python/simu_config/base_cff.py +++ b/Validation/CTPPS/python/simu_config/base_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms # load standard files -from RecoCTPPS.ProtonReconstruction.ctppsProtons_cff import * +from RecoPPS.ProtonReconstruction.ctppsProtons_cff import * # undo unapplicable settings #del ctppsRPAlignmentCorrectionsDataESSourceXML @@ -97,9 +97,9 @@ ctppsDirectProtonSimulation.produceRecHits = True # local reconstruction -from RecoCTPPS.TotemRPLocal.totemRPLocalReconstruction_cff import * -from RecoCTPPS.PixelLocal.ctppsPixelLocalReconstruction_cff import * -from RecoCTPPS.TotemRPLocal.ctppsLocalTrackLiteProducer_cff import * +from RecoPPS.Local.totemRPLocalReconstruction_cff import * +from RecoPPS.Local.ctppsPixelLocalReconstruction_cff import * +from RecoPPS.Local.ctppsLocalTrackLiteProducer_cff import * totemRPUVPatternFinder.tagRecHit = cms.InputTag('ctppsDirectProtonSimulation') ctppsPixelLocalTracks.label = "ctppsDirectProtonSimulation" From 46eb7190383ff64074e0306252cb7b07bfbbfc2a Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Tue, 25 Feb 2020 13:34:35 +0100 Subject: [PATCH 2/6] Fixed dependencies in CondCore CondTools and SimPPS. --- CondCore/CTPPSPlugins/BuildFile.xml | 2 +- CondCore/CTPPSPlugins/src/plugin.cc | 14 +++++++------- CondCore/Utilities/BuildFile.xml | 2 +- CondCore/Utilities/src/CondFormats.h | 12 ++++++------ CondTools/CTPPS/BuildFile.xml | 2 +- CondTools/CTPPS/plugins/BuildFile.xml | 2 +- .../CTPPS/plugins/CTPPSPixGainCalibsESAnalyzer.cc | 2 +- .../CTPPS/plugins/CTPPSPixelDAQMappingAnalyzer.cc | 4 ++-- .../CTPPS/plugins/CTPPSRPAlignmentInfoReader.cc | 2 +- .../CTPPS/plugins/PPSTimingCalibrationAnalyzer.cc | 2 +- .../CTPPS/plugins/PPSTimingCalibrationWriter.cc | 2 +- .../CTPPS/plugins/RetrieveCTPPSBeamParameters.cc | 2 +- .../CTPPS/plugins/WriteCTPPSBeamParameters.cc | 2 +- .../CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc | 2 +- .../CTPPS/src/WriteCTPPSPixGainCalibrations.cc | 6 +++--- CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc | 4 ++-- CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc | 4 ++-- .../test/write-ctpps-pixel-analysismask_cfg.py | 2 +- .../CTPPS/test/write-ctpps-pixel-daqmap_cfg.py | 2 +- .../write-ctpps-rpalignmentcorrectionsdata_cfg.py | 10 +++++----- .../test/write-ctpps-rpmisalignedalignment_cfg.py | 8 ++++---- .../CTPPS/test/write-ctpps-rprealalignment_cfg.py | 10 +++++----- .../test/write-ctpps-rprealalignment_singletest.py | 10 +++++----- .../test/write-ctpps-rprealalignment_table_cfg.py | 10 +++++----- .../test/write-ctpps-rprealalignment_table_test.py | 10 +++++----- .../interface/RPixDetDigitizer.h | 4 ++-- .../interface/RPixDummyROCSimulator.h | 4 ++-- .../plugins/PPSPixelDigiProducer.cc | 6 +++--- SimPPS/RPDigiProducer/plugins/BuildFile.xml | 2 +- .../RPDigiProducer/plugins/DeadChannelsManager.cc | 4 ++-- .../RPDigiProducer/plugins/DeadChannelsManager.h | 2 +- SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc | 2 +- .../plugins/RPDisplacementGenerator.cc | 2 +- 33 files changed, 77 insertions(+), 77 deletions(-) diff --git a/CondCore/CTPPSPlugins/BuildFile.xml b/CondCore/CTPPSPlugins/BuildFile.xml index 3198618ded3c7..eede117d2d343 100644 --- a/CondCore/CTPPSPlugins/BuildFile.xml +++ b/CondCore/CTPPSPlugins/BuildFile.xml @@ -1,7 +1,7 @@ - + diff --git a/CondCore/CTPPSPlugins/src/plugin.cc b/CondCore/CTPPSPlugins/src/plugin.cc index 72e60ff526d29..63646c805f0e1 100644 --- a/CondCore/CTPPSPlugins/src/plugin.cc +++ b/CondCore/CTPPSPlugins/src/plugin.cc @@ -1,19 +1,19 @@ #include "CondCore/ESSources/interface/registration_macros.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "CondFormats/DataRecord/interface/CTPPSPixelGainCalibrationsRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "CondFormats/AlignmentRecord/interface/CTPPSRPAlignmentCorrectionsDataRcd.h" #include "CondFormats/AlignmentRecord/interface/RPRealAlignmentRecord.h" #include "CondFormats/AlignmentRecord/interface/RPMisalignedAlignmentRecord.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include "CondFormats/DataRecord/interface/PPSTimingCalibrationRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" #include "CondFormats/DataRecord/interface/CTPPSOpticsRcd.h" REGISTER_PLUGIN(CTPPSBeamParametersRcd, CTPPSBeamParameters); diff --git a/CondCore/Utilities/BuildFile.xml b/CondCore/Utilities/BuildFile.xml index 51fd20e0b62c5..29893306dbdbb 100644 --- a/CondCore/Utilities/BuildFile.xml +++ b/CondCore/Utilities/BuildFile.xml @@ -34,7 +34,7 @@ - + diff --git a/CondCore/Utilities/src/CondFormats.h b/CondCore/Utilities/src/CondFormats.h index 6442102e47b3a..3ced0f8476563 100644 --- a/CondCore/Utilities/src/CondFormats.h +++ b/CondCore/Utilities/src/CondFormats.h @@ -26,12 +26,12 @@ #include "CondFormats/CSCObjects/interface/CSCDBPedestals.h" #include "CondFormats/CSCObjects/interface/CSCDDUMap.h" #include "CondFormats/CSCObjects/interface/CSCL1TPParameters.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" -#include "CondFormats/CTPPSReadoutObjects/interface/LHCOpticalFunctionsSetCollection.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/LHCOpticalFunctionsSetCollection.h" #include "CondFormats/DTObjects/interface/DTCCBConfig.h" #include "CondFormats/DTObjects/interface/DTDeadFlag.h" #include "CondFormats/DTObjects/interface/DTHVStatus.h" diff --git a/CondTools/CTPPS/BuildFile.xml b/CondTools/CTPPS/BuildFile.xml index e219cd905d12b..505f7ab450d22 100644 --- a/CondTools/CTPPS/BuildFile.xml +++ b/CondTools/CTPPS/BuildFile.xml @@ -1,5 +1,5 @@ - + diff --git a/CondTools/CTPPS/plugins/BuildFile.xml b/CondTools/CTPPS/plugins/BuildFile.xml index 285e5232d53f5..2b831991ffa0a 100644 --- a/CondTools/CTPPS/plugins/BuildFile.xml +++ b/CondTools/CTPPS/plugins/BuildFile.xml @@ -1,4 +1,4 @@ - + diff --git a/CondTools/CTPPS/plugins/CTPPSPixGainCalibsESAnalyzer.cc b/CondTools/CTPPS/plugins/CTPPSPixGainCalibsESAnalyzer.cc index 7f4403cf87434..29acf0dd3c0d1 100644 --- a/CondTools/CTPPS/plugins/CTPPSPixGainCalibsESAnalyzer.cc +++ b/CondTools/CTPPS/plugins/CTPPSPixGainCalibsESAnalyzer.cc @@ -7,7 +7,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "CondFormats/DataRecord/interface/CTPPSPixelGainCalibrationsRcd.h" #include "TH2D.h" #include "TFile.h" diff --git a/CondTools/CTPPS/plugins/CTPPSPixelDAQMappingAnalyzer.cc b/CondTools/CTPPS/plugins/CTPPSPixelDAQMappingAnalyzer.cc index 36f72158903b6..4e26c4c65ecde 100644 --- a/CondTools/CTPPS/plugins/CTPPSPixelDAQMappingAnalyzer.cc +++ b/CondTools/CTPPS/plugins/CTPPSPixelDAQMappingAnalyzer.cc @@ -8,9 +8,9 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "CondCore/CondDB/interface/Time.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" using namespace std; diff --git a/CondTools/CTPPS/plugins/CTPPSRPAlignmentInfoReader.cc b/CondTools/CTPPS/plugins/CTPPSRPAlignmentInfoReader.cc index 18d3c4238a34d..97359f220b8f5 100644 --- a/CondTools/CTPPS/plugins/CTPPSRPAlignmentInfoReader.cc +++ b/CondTools/CTPPS/plugins/CTPPSRPAlignmentInfoReader.cc @@ -9,7 +9,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "CondCore/CondDB/interface/Time.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "CondFormats/AlignmentRecord/interface/CTPPSRPAlignmentCorrectionsDataRcd.h" #include "CondFormats/AlignmentRecord/interface/RPRealAlignmentRecord.h" #include "CondFormats/AlignmentRecord/interface/RPMisalignedAlignmentRecord.h" diff --git a/CondTools/CTPPS/plugins/PPSTimingCalibrationAnalyzer.cc b/CondTools/CTPPS/plugins/PPSTimingCalibrationAnalyzer.cc index e059980b097c7..6496f6665c4be 100644 --- a/CondTools/CTPPS/plugins/PPSTimingCalibrationAnalyzer.cc +++ b/CondTools/CTPPS/plugins/PPSTimingCalibrationAnalyzer.cc @@ -19,7 +19,7 @@ #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include "CondFormats/DataRecord/interface/PPSTimingCalibrationRcd.h" #include diff --git a/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc b/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc index e13413d4c7eac..ae5963a884fcc 100644 --- a/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc +++ b/CondTools/CTPPS/plugins/PPSTimingCalibrationWriter.cc @@ -18,7 +18,7 @@ #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" -#include "CondFormats/CTPPSReadoutObjects/interface/PPSTimingCalibration.h" +#include "CondFormats/PPSObjects/interface/PPSTimingCalibration.h" #include "CondFormats/DataRecord/interface/PPSTimingCalibrationRcd.h" #include diff --git a/CondTools/CTPPS/plugins/RetrieveCTPPSBeamParameters.cc b/CondTools/CTPPS/plugins/RetrieveCTPPSBeamParameters.cc index a6ae6c21cf12a..0d1178f030f1c 100644 --- a/CondTools/CTPPS/plugins/RetrieveCTPPSBeamParameters.cc +++ b/CondTools/CTPPS/plugins/RetrieveCTPPSBeamParameters.cc @@ -26,7 +26,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" #include diff --git a/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc b/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc index f9c72888c2557..2cae48a0d260b 100644 --- a/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc +++ b/CondTools/CTPPS/plugins/WriteCTPPSBeamParameters.cc @@ -28,7 +28,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" #include diff --git a/CondTools/CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc b/CondTools/CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc index a61fa70027b74..669c56940ab4f 100644 --- a/CondTools/CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc +++ b/CondTools/CTPPS/src/CTPPSRPAlignmentInfoAnalyzer.cc @@ -23,7 +23,7 @@ #include "CondFormats/AlignmentRecord/interface/RPRealAlignmentRecord.h" #include "CondFormats/AlignmentRecord/interface/RPMisalignedAlignmentRecord.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include //---------------------------------------------------------------------------------------------------- diff --git a/CondTools/CTPPS/src/WriteCTPPSPixGainCalibrations.cc b/CondTools/CTPPS/src/WriteCTPPSPixGainCalibrations.cc index 2d519338255b2..7fb27137f92da 100644 --- a/CondTools/CTPPS/src/WriteCTPPSPixGainCalibrations.cc +++ b/CondTools/CTPPS/src/WriteCTPPSPixGainCalibrations.cc @@ -8,9 +8,9 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" //CTPPS Gain Calibration Conditions Object -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibration.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibration.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelIndices.h" //CTPPS tracker DetId #include "DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h" #include "TFile.h" diff --git a/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc b/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc index b6d0b410ecc7b..51d1fce403ea7 100644 --- a/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc +++ b/CondTools/CTPPS/src/WriteCTPPSPixelAnalysisMask.cc @@ -22,8 +22,8 @@ #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include diff --git a/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc b/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc index 74aaf7a790556..50e5be7afb289 100644 --- a/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc +++ b/CondTools/CTPPS/src/WriteCTPPSPixelDAQMapping.cc @@ -22,8 +22,8 @@ #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include diff --git a/CondTools/CTPPS/test/write-ctpps-pixel-analysismask_cfg.py b/CondTools/CTPPS/test/write-ctpps-pixel-analysismask_cfg.py index 2e28957debcb7..98d49ffad1299 100644 --- a/CondTools/CTPPS/test/write-ctpps-pixel-analysismask_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-pixel-analysismask_cfg.py @@ -15,7 +15,7 @@ #) # load a mapping -process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") #Database output service process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CondTools/CTPPS/test/write-ctpps-pixel-daqmap_cfg.py b/CondTools/CTPPS/test/write-ctpps-pixel-daqmap_cfg.py index d437190d5f0ff..5c8ac2b599275 100644 --- a/CondTools/CTPPS/test/write-ctpps-pixel-daqmap_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-pixel-daqmap_cfg.py @@ -15,7 +15,7 @@ #) # load a mapping -process.load("CondFormats.CTPPSReadoutObjects.CTPPSPixelDAQMappingESSourceXML_cfi") +process.load("CondFormats.PPSObjects.CTPPSPixelDAQMappingESSourceXML_cfi") #Database output service process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CondTools/CTPPS/test/write-ctpps-rpalignmentcorrectionsdata_cfg.py b/CondTools/CTPPS/test/write-ctpps-rpalignmentcorrectionsdata_cfg.py index bb8de96a5753e..83bb85bfec365 100644 --- a/CondTools/CTPPS/test/write-ctpps-rpalignmentcorrectionsdata_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-rpalignmentcorrectionsdata_cfg.py @@ -12,11 +12,11 @@ # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/CondTools/CTPPS/test/write-ctpps-rpmisalignedalignment_cfg.py b/CondTools/CTPPS/test/write-ctpps-rpmisalignedalignment_cfg.py index 09d76e9c178c2..0293b3f2289ef 100644 --- a/CondTools/CTPPS/test/write-ctpps-rpmisalignedalignment_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-rpmisalignedalignment_cfg.py @@ -12,10 +12,10 @@ # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/CondTools/CTPPS/test/write-ctpps-rprealalignment_cfg.py b/CondTools/CTPPS/test/write-ctpps-rprealalignment_cfg.py index 9ff6bd5794192..3025a34b4618a 100644 --- a/CondTools/CTPPS/test/write-ctpps-rprealalignment_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-rprealalignment_cfg.py @@ -12,11 +12,11 @@ # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/CondTools/CTPPS/test/write-ctpps-rprealalignment_singletest.py b/CondTools/CTPPS/test/write-ctpps-rprealalignment_singletest.py index bb9c2c20a2f84..60a16ed3659ce 100644 --- a/CondTools/CTPPS/test/write-ctpps-rprealalignment_singletest.py +++ b/CondTools/CTPPS/test/write-ctpps-rprealalignment_singletest.py @@ -16,16 +16,16 @@ # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring( "CondTools/CTPPS/test/RPixGeometryCorrections.xml", "CondTools/CTPPS/test/largeXMLmanipulations/real_alignment_iov"+str(startrun)+".xml" ) -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_cfg.py b/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_cfg.py index 6a0f9e8cadb0c..36858e06f9537 100644 --- a/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_cfg.py +++ b/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_cfg.py @@ -20,15 +20,15 @@ ) # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring( - #"CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml" + #"CondFormats/PPSObjects/xml/sample_alignment_corrections.xml" "CondTools/CTPPS/test/RPixGeometryCorrections.xml", "CondTools/CTPPS/test/"+subdir+"real_alignment_iov"+startrun+".xml" ) -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_test.py b/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_test.py index 8df8bc8276659..5e1fa8090d844 100644 --- a/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_test.py +++ b/CondTools/CTPPS/test/write-ctpps-rprealalignment_table_test.py @@ -20,14 +20,14 @@ ) # load the alignment xml file -process.load("CondFormats.CTPPSReadoutObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") -#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.load("CondFormats.PPSObjects.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi") +#process.ctppsRPAlignmentCorrectionsDataESSourceXML.XMLFile = cms.string("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") process.ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring( - #"CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml" + #"CondFormats/PPSObjects/xml/sample_alignment_corrections.xml" "CondTools/CTPPS/test/largeXMLmanipulations/real_alignment_iov303832.xml" ) -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") -process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/CTPPSReadoutObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MeasuredFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") +process.ctppsRPAlignmentCorrectionsDataESSourceXML.MisalignedFiles = cms.vstring("CondFormats/PPSObjects/xml/sample_alignment_corrections.xml") #Database output service diff --git a/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h b/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h index 2b3a5ac5024ac..abda9e4f764d0 100644 --- a/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h +++ b/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h @@ -20,10 +20,10 @@ #include "SimPPS/PPSPixelDigiProducer/interface/RPixPileUpSignals.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" namespace CLHEP { class HepRandomEngine; diff --git a/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h b/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h index ad12b3e8fcce1..a7778141c4e12 100644 --- a/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h +++ b/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h @@ -7,8 +7,8 @@ #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigi.h" #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigiCollection.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" class RPixDummyROCSimulator { diff --git a/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc b/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc index 1f7149c3b534b..07e239c977c4a 100644 --- a/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc +++ b/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc @@ -47,9 +47,9 @@ // DB #include "CondFormats/DataRecord/interface/CTPPSPixelDAQMappingRcd.h" #include "CondFormats/DataRecord/interface/CTPPSPixelAnalysisMaskRcd.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelDAQMapping.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelAnalysisMask.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelGainCalibrations.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" // user include files diff --git a/SimPPS/RPDigiProducer/plugins/BuildFile.xml b/SimPPS/RPDigiProducer/plugins/BuildFile.xml index 5f117c4ade35e..d4a5a87fd9999 100755 --- a/SimPPS/RPDigiProducer/plugins/BuildFile.xml +++ b/SimPPS/RPDigiProducer/plugins/BuildFile.xml @@ -1,6 +1,6 @@ - + diff --git a/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.cc b/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.cc index 5f25150fd7779..6070c61e181d7 100644 --- a/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.cc +++ b/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.cc @@ -1,6 +1,6 @@ #include "SimPPS/RPDigiProducer/plugins/DeadChannelsManager.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h" +#include "CondFormats/PPSObjects/interface/TotemSymbId.h" +#include "CondFormats/PPSObjects/interface/TotemDAQMapping.h" #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h" #include "SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.h" #include diff --git a/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.h b/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.h index b2d6a08502920..e0d29c3ff1f52 100644 --- a/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.h +++ b/SimPPS/RPDigiProducer/plugins/DeadChannelsManager.h @@ -3,7 +3,7 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "SimPPS/RPDigiProducer/interface/RPSimTypes.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" /* * This purpose of this class is to answer the question whether a channel (given by detectorId diff --git a/SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc b/SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc index 3631cd8ae1717..0f9df244747f1 100644 --- a/SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc +++ b/SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc @@ -26,7 +26,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/RandomNumberGenerator.h" -#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h" +#include "CondFormats/PPSObjects/interface/TotemAnalysisMask.h" #include "CondFormats/DataRecord/interface/TotemReadoutRcd.h" #include "SimPPS/RPDigiProducer/interface/RPSimTypes.h" #include "SimPPS/RPDigiProducer/plugins/RPDetDigitizer.h" diff --git a/SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.cc b/SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.cc index 1ca64fbd89f0e..c1208fdd4a1d5 100644 --- a/SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.cc +++ b/SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.cc @@ -5,7 +5,7 @@ #include "Geometry/Records/interface/VeryForwardMisalignedGeometryRecord.h" #include "Geometry/Records/interface/VeryForwardRealGeometryRecord.h" #include "Geometry/VeryForwardGeometryBuilder/interface/CTPPSGeometry.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSRPAlignmentCorrectionsData.h" +#include "CondFormats/PPSObjects/interface/CTPPSRPAlignmentCorrectionsData.h" #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimPPS/RPDigiProducer/plugins/RPDisplacementGenerator.h" From 06b1a3fd88c302f2d2f4275d33d5e8307d2fc87a Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Tue, 25 Feb 2020 14:02:58 +0100 Subject: [PATCH 3/6] Further corrected dependencies. --- Configuration/EventContent/python/EventContent_cff.py | 2 +- SimPPS/PPSPixelDigiProducer/BuildFile.xml | 2 +- SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h | 2 +- SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h | 2 +- SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index bce66dc8ec8d2..7dfa1fc2efe9a 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -59,7 +59,7 @@ from L1Trigger.Configuration.L1Trigger_EventContent_cff import * from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import * from CommonTools.ParticleFlow.EITopPAG_EventContent_cff import EITopPAGEventContent -from RecoCTPPS.Configuration.RecoCTPPS_EventContent_cff import * +from RecoPPS.Configuration.RecoCTPPS_EventContent_cff import * # raw2digi that are already the final RECO/AOD products from EventFilter.ScalersRawToDigi.Scalers_EventContent_cff import * diff --git a/SimPPS/PPSPixelDigiProducer/BuildFile.xml b/SimPPS/PPSPixelDigiProducer/BuildFile.xml index d426b83f0e62b..393316c3413bc 100755 --- a/SimPPS/PPSPixelDigiProducer/BuildFile.xml +++ b/SimPPS/PPSPixelDigiProducer/BuildFile.xml @@ -1,5 +1,5 @@ - + diff --git a/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h b/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h index abda9e4f764d0..07dbd6fbc95cf 100644 --- a/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h +++ b/SimPPS/PPSPixelDigiProducer/interface/RPixDetDigitizer.h @@ -21,7 +21,7 @@ #include "SimPPS/PPSPixelDigiProducer/interface/RPixPileUpSignals.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" diff --git a/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h b/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h index a7778141c4e12..9cfd009e67179 100644 --- a/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h +++ b/SimPPS/PPSPixelDigiProducer/interface/RPixDummyROCSimulator.h @@ -9,7 +9,7 @@ #include "DataFormats/CTPPSDigi/interface/CTPPSPixelDigiCollection.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" class RPixDummyROCSimulator { public: diff --git a/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc b/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc index 07e239c977c4a..7805d555e5756 100644 --- a/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc +++ b/SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc @@ -50,7 +50,7 @@ #include "CondFormats/PPSObjects/interface/CTPPSPixelDAQMapping.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelAnalysisMask.h" #include "CondFormats/PPSObjects/interface/CTPPSPixelGainCalibrations.h" -#include "RecoCTPPS/PixelLocal/interface/CTPPSPixelGainCalibrationDBService.h" +#include "RecoPPS/Local/interface/CTPPSPixelGainCalibrationDBService.h" // user include files #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" From 073a1d3873019d9ea285dc3dfd6935673548ca8a Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Tue, 25 Feb 2020 14:59:00 +0100 Subject: [PATCH 4/6] Reverted change of variable names. --- .../Configuration/python/RecoCTPPS_EventContent_cff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py b/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py index b3eef83e81fdb..df8837853ad52 100644 --- a/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py +++ b/RecoPPS/Configuration/python/RecoCTPPS_EventContent_cff.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -RecoPPSAOD = cms.PSet( +RecoCTPPSAOD = cms.PSet( outputCommands = cms.untracked.vstring( # trigger counters 'keep TotemTriggerCounters_totemTriggerRawToDigi_*_*', @@ -40,14 +40,14 @@ ) -RecoPPSRECO = cms.PSet( +RecoCTPPSRECO = cms.PSet( outputCommands = cms.untracked.vstring() ) -RecoPPSFEVT = cms.PSet( +RecoCTPPSFEVT = cms.PSet( outputCommands = cms.untracked.vstring() ) -RecoPPSRECO.outputCommands.extend(RecoPPSAOD.outputCommands) -RecoPPSFEVT.outputCommands.extend(RecoPPSRECO.outputCommands) +RecoCTPPSRECO.outputCommands.extend(RecoCTPPSAOD.outputCommands) +RecoCTPPSFEVT.outputCommands.extend(RecoCTPPSRECO.outputCommands) From 8932965956ac91e323886c4259b7f87f0675ea9a Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Tue, 25 Feb 2020 14:59:44 +0100 Subject: [PATCH 5/6] Applied renaming in miniAOD_tools.py. --- PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 0f2074fce9149..559d61e60142d 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -543,8 +543,8 @@ def miniAOD_customizeOutput(out): def miniAOD_customizeData(process): from PhysicsTools.PatAlgos.tools.coreTools import runOnData runOnData( process, outputModules = [] ) - process.load("RecoCTPPS.TotemRPLocal.ctppsLocalTrackLiteProducer_cff") - process.load("RecoCTPPS.ProtonReconstruction.ctppsProtons_cff") + process.load("RecoPPS.Local.ctppsLocalTrackLiteProducer_cff") + process.load("RecoPPS.ProtonReconstruction.ctppsProtons_cff") process.load("Geometry.VeryForwardGeometry.geometryRPFromDB_cfi") task = getPatAlgosToolsTask(process) from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 From 76ece334edeaa1830c897342c9fbd79be0765a49 Mon Sep 17 00:00:00 2001 From: Jan Kaspar Date: Mon, 2 Mar 2020 12:59:33 +0100 Subject: [PATCH 6/6] Fixes after rebase. --- IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc | 2 +- RecoPPS/Local/BuildFile.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc b/IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc index cdd642a5e3e33..a59e2b304e7ee 100644 --- a/IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc +++ b/IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc @@ -18,7 +18,7 @@ #include "DataFormats/HepMCCandidate/interface/GenParticle.h" -#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h" +#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h" #include "CondFormats/DataRecord/interface/CTPPSBeamParametersRcd.h" #include diff --git a/RecoPPS/Local/BuildFile.xml b/RecoPPS/Local/BuildFile.xml index f30956731fa40..9c07d1d7892f5 100644 --- a/RecoPPS/Local/BuildFile.xml +++ b/RecoPPS/Local/BuildFile.xml @@ -4,8 +4,10 @@ + +