Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PPS: rename directories with misleading names #29037

Merged
merged 6 commits into from Mar 3, 2020
Merged

PPS: rename directories with misleading names #29037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5da7d4
* renamed CondFormats/CTPPSReadoutObjects --> CondFormats/PPSObjects
jan-kaspar Feb 25, 2020
46eb719
Fixed dependencies in CondCore CondTools and SimPPS.
jan-kaspar Feb 25, 2020
06b1a3f
Further corrected dependencies.
jan-kaspar Feb 25, 2020
073a1d3
Reverted change of variable names.
jan-kaspar Feb 25, 2020
8932965
Applied renaming in miniAOD_tools.py.
jan-kaspar Feb 25, 2020
76ece33
Fixes after rebase.
jan-kaspar Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<use name="FWCore/Framework"/>
<use name="Utilities/Xerces"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/CTPPSReadoutObjects"/>
<use name="CondFormats/PPSObjects"/>
<use name="DataFormats/CTPPSDetId"/>
<use name="CondFormats/RunInfo"/>
<use name="clhep"/>
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/plugins/CTPPSAlignmentInfo.cc
View file
Open in desktop
Expand Up @@ -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"

//----------------------------------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/plugins/CTPPSBeamParametersESSource.cc
View file
Open in desktop
@@ -1,6 +1,6 @@
/****************************************************************************
*
* CondFormats/CTPPSReadoutObjects/plugins/CTPPSBeamParametersESSource.cc
* CondFormats/PPSObjects/plugins/CTPPSBeamParametersESSource.cc
*
* Description : - Loads CTPPSBeamParameters from the CTPPSBeamParametersESSource_cfi.py
* config file.
Expand All @@ -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 <memory>
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/plugins/CTPPSBeamParametersFromLHCInfoESSource.cc
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@

#include "CondFormats/RunInfo/interface/LHCInfo.h"

#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSBeamParameters.h"
#include "CondFormats/PPSObjects/interface/CTPPSBeamParameters.h"

//----------------------------------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc
View file
Open in desktop
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/plugins/CTPPSOpticalFunctionsESSource.cc
View file
Open in desktop
Expand Up @@ -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"

//----------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions CalibPPS/ESProducers/plugins/CTPPSPixelDAQMappingESSourceXML.cc
View file
Open in desktop
Expand Up @@ -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 <xercesc/parsers/XercesDOMParser.hpp>
Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/plugins/CTPPSRPAlignmentCorrectionsDataESSourceXML.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/plugins/PPSTimingCalibrationESSource.cc
View file
Open in desktop
Expand Up @@ -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 <boost/property_tree/json_parser.hpp>
Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/plugins/PrintTotemDAQMapping.cc
View file
Open in desktop
Expand Up @@ -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"

//----------------------------------------------------------------------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
View file
Open in desktop
Expand Up @@ -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 <xercesc/parsers/XercesDOMParser.hpp>
Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/python/CTPPSPixelDAQMappingESSourceXML_cfi.py
View file
Open in desktop
Expand Up @@ -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")
)
)
)
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py
View file
Open in desktop
Expand Up @@ -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()
#)
)
Expand Down
8 changes: 4 additions & 4 deletions CalibPPS/ESProducers/test/alignment_xml_io_test.cc
View file
Open in desktop
@@ -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"
Expand Down Expand Up @@ -97,4 +97,4 @@ int main() {
}

return 0;
}
}
4 changes: 2 additions & 2 deletions CalibPPS/ESProducers/test/ppsTimingCalibrationWriter_cfg.py
View file
Open in desktop
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CalibPPS/ESProducers/test/print_alignment_info_XML_cfg.py
View file
Open in desktop
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/ESProducers/test/test_totemDAQMappingESSourceXML_cfg.py
View file
Open in desktop
Expand Up @@ -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()
)
)
Expand Down
2 changes: 1 addition & 1 deletion CondCore/CTPPSPlugins/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<use name="FWCore/Framework"/>
<use name="FWCore/PluginManager"/>
<use name="CondCore/ESSources"/>
<use name="CondFormats/CTPPSReadoutObjects"/>
<use name="CondFormats/PPSObjects"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/AlignmentRecord"/>
<use name="CondFormats/Serialization"/>
Expand Down
14 changes: 7 additions & 7 deletions CondCore/CTPPSPlugins/src/plugin.cc
View file
Open in desktop
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion CondCore/Utilities/BuildFile.xml
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
<use name="CondFormats/MFObjects"/>
<use name="CondFormats/PCLConfig"/>
<use name="CondFormats/SiPhase2TrackerObjects"/>
<use name="CondFormats/CTPPSReadoutObjects"/>
<use name="CondFormats/PPSObjects"/>
<use name="rootgraphics"/>
<export>
<lib name="1"/>
Expand Down
12 changes: 6 additions & 6 deletions CondCore/Utilities/src/CondFormats.h
View file
Open in desktop
Expand Up @@ -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"
Expand Down
13 changes: 0 additions & 13 deletions CondFormats/CTPPSReadoutObjects/interface/LHCInterpolatedOpticalFunctionsSetCollection.h
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions CondFormats/CTPPSReadoutObjects/src/headers.h
View file
Open in desktop

This file was deleted.

0 ...Formats/CTPPSReadoutObjects/BuildFile.xml → CondFormats/PPSObjects/BuildFile.xml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...utObjects/interface/CTPPSBeamParameters.h → ...PSObjects/interface/CTPPSBeamParameters.h
View file
Open in desktop
@@ -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
Expand Down Expand Up @@ -120,4 +120,4 @@ class CTPPSBeamParameters {

std::ostream &operator<<(std::ostream &, CTPPSBeamParameters);

#endif
#endif
6 changes: 3 additions & 3 deletions ...bjects/interface/CTPPSPixelAnalysisMask.h → ...bjects/interface/CTPPSPixelAnalysisMask.h
View file
Open in desktop
Expand Up @@ -4,14 +4,14 @@
*
****************************************************************************/

#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelAnalysisMask
#define CondFormats_CTPPSReadoutObjects_CTPPSPixelAnalysisMask
#ifndef CondFormats_PPSObjects_CTPPSPixelAnalysisMask
#define CondFormats_PPSObjects_CTPPSPixelAnalysisMask

#include <set>
#include <map>

#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
Expand Down
8 changes: 4 additions & 4 deletions ...tObjects/interface/CTPPSPixelDAQMapping.h → ...SObjects/interface/CTPPSPixelDAQMapping.h
View file
Open in desktop
Expand Up @@ -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 <map>
#include <set>
Expand Down
4 changes: 2 additions & 2 deletions ...jects/interface/CTPPSPixelFramePosition.h → ...jects/interface/CTPPSPixelFramePosition.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
****************************************************************************/

#ifndef CondFormats_CTPPSReadoutObjects_CTPPSPixelFramePosition
#define CondFormats_CTPPSReadoutObjects_CTPPSPixelFramePosition
#ifndef CondFormats_PPSObjects_CTPPSPixelFramePosition
#define CondFormats_PPSObjects_CTPPSPixelFramePosition

#include <iostream>
#include <string>
Expand Down
6 changes: 3 additions & 3 deletions ...cts/interface/CTPPSPixelGainCalibration.h → ...cts/interface/CTPPSPixelGainCalibration.h
View file
Open in desktop
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...ts/interface/CTPPSPixelGainCalibrations.h → ...ts/interface/CTPPSPixelGainCalibrations.h
View file
Open in desktop
@@ -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 <map>
#include <vector>

Expand Down
0 ...doutObjects/interface/CTPPSPixelIndices.h → .../PPSObjects/interface/CTPPSPixelIndices.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...SReadoutObjects/interface/CTPPSPixelROC.h → ...mats/PPSObjects/interface/CTPPSPixelROC.h
View file
Open in desktop
@@ -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 <cstdint>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions ...nterface/CTPPSRPAlignmentCorrectionData.h → ...nterface/CTPPSRPAlignmentCorrectionData.h
View file
Open in desktop
Expand Up @@ -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"

Expand Down