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

CTPPS: directory rename Totem -> CTPPS (back-port of #15311) #15317

Merged
merged 11 commits into from Aug 9, 2016
Merged

CTPPS: directory rename Totem -> CTPPS (back-port of #15311) #15317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4beb300
Directories rename: Totem -> CTPPS.
jan-kaspar Jul 27, 2016
ae3a784
DataFormats/CTPPSDigi: paths updated
jan-kaspar Jul 27, 2016
8d3fa1a
CondFormats/CTPPSReadoutObjects: paths updated
jan-kaspar Jul 27, 2016
283a85e
EventFilter/CTPPSRawToDigi: paths updated
jan-kaspar Jul 27, 2016
6fd8862
Geometry/VeryForwardGeometryBuilder: paths updated
jan-kaspar Jul 27, 2016
26d9398
RecoCTPPS: paths updated
jan-kaspar Jul 27, 2016
97276ee
DQM/CTPPS: paths updated
jan-kaspar Jul 27, 2016
c2d27fe
DQM/Integration: paths updated
jan-kaspar Jul 27, 2016
f24d44f
Configuration/StandardSequences: paths updated
jan-kaspar Jul 27, 2016
92c3f72
bugfix: removed reference to non-existing config
jan-kaspar Jul 27, 2016
77d408a
DataFormats/CTPPSDetId: paths upated
jan-kaspar Jul 27, 2016
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
0 ...Formats/TotemReadoutObjects/BuildFile.xml → ...Formats/CTPPSReadoutObjects/BuildFile.xml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...doutObjects/interface/TotemAnalysisMask.h → ...doutObjects/interface/TotemAnalysisMask.h
View file
Open in desktop
Expand Up @@ -7,10 +7,10 @@
*
****************************************************************************/

#ifndef CondFormats_TotemReadoutObjects_TotemAnalysisMask
#define CondFormats_TotemReadoutObjects_TotemAnalysisMask
#ifndef CondFormats_CTPPSReadoutObjects_TotemAnalysisMask
#define CondFormats_CTPPSReadoutObjects_TotemAnalysisMask

#include "CondFormats/TotemReadoutObjects/interface/TotemSymbId.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h"

#include <set>
#include <map>
Expand Down
8 changes: 4 additions & 4 deletions ...eadoutObjects/interface/TotemDAQMapping.h → ...eadoutObjects/interface/TotemDAQMapping.h
View file
Open in desktop
Expand Up @@ -7,12 +7,12 @@
*
****************************************************************************/

#ifndef CondFormats_TotemReadoutObjects_TotemDAQMapping
#define CondFormats_TotemReadoutObjects_TotemDAQMapping
#ifndef CondFormats_CTPPSReadoutObjects_TotemDAQMapping
#define CondFormats_CTPPSReadoutObjects_TotemDAQMapping

#include "CondFormats/TotemReadoutObjects/interface/TotemFramePosition.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h"

#include "CondFormats/TotemReadoutObjects/interface/TotemSymbId.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h"

#include <map>

Expand Down
4 changes: 2 additions & 2 deletions ...outObjects/interface/TotemFramePosition.h → ...outObjects/interface/TotemFramePosition.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
****************************************************************************/

#ifndef CondFormats_TotemReadoutObjects_TotemFramePosition
#define CondFormats_TotemReadoutObjects_TotemFramePosition
#ifndef CondFormats_CTPPSReadoutObjects_TotemFramePosition
#define CondFormats_CTPPSReadoutObjects_TotemFramePosition

#include <iostream>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions ...temReadoutObjects/interface/TotemSymbId.h → ...PPSReadoutObjects/interface/TotemSymbId.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
****************************************************************************/

#ifndef CondFormats_TotemReadoutObjects_TotemSymbId
#define CondFormats_TotemReadoutObjects_TotemSymbId
#ifndef CondFormats_CTPPSReadoutObjects_TotemSymbId
#define CondFormats_CTPPSReadoutObjects_TotemSymbId

#include <iostream>

Expand Down
4 changes: 2 additions & 2 deletions ...TotemReadoutObjects/plugins/BuildFile.xml → ...CTPPSReadoutObjects/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<library name="CondFormatsTotemReadoutObjectsPlugins" file="*.cc">
<library name="CondFormatsCTPPSReadoutObjectsPlugins" file="*.cc">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/TotemReadoutObjects"/>
<use name="CondFormats/CTPPSReadoutObjects"/>
<use name="xerces-c"/>
</library>
4 changes: 2 additions & 2 deletions ...utObjects/plugins/PrintTotemDAQMapping.cc → ...utObjects/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/TotemReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/TotemReadoutObjects/interface/TotemAnalysisMask.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h"

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

Expand Down
6 changes: 3 additions & 3 deletions ...cts/plugins/TotemDAQMappingESSourceXML.cc → ...cts/plugins/TotemDAQMappingESSourceXML.cc
View file
Open in desktop
Expand Up @@ -20,9 +20,9 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "CondFormats/DataRecord/interface/TotemReadoutRcd.h"
#include "CondFormats/TotemReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/TotemReadoutObjects/interface/TotemAnalysisMask.h"
#include "CondFormats/TotemReadoutObjects/interface/TotemFramePosition.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h"

#include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/dom/DOM.hpp>
Expand Down
0 .../python/TotemDAQMappingESSourceXML_cfi.py → .../python/TotemDAQMappingESSourceXML_cfi.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...emReadoutObjects/src/TotemAnalysisMask.cc → ...PSReadoutObjects/src/TotemAnalysisMask.cc
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@

#include "FWCore/Utilities/interface/typelookup.h"

#include "CondFormats/TotemReadoutObjects/interface/TotemAnalysisMask.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h"

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

Expand Down
2 changes: 1 addition & 1 deletion ...otemReadoutObjects/src/TotemDAQMapping.cc → ...TPPSReadoutObjects/src/TotemDAQMapping.cc
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@

#include "FWCore/Utilities/interface/typelookup.h"

#include "CondFormats/TotemReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h"

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion ...mReadoutObjects/src/TotemFramePosition.cc → ...SReadoutObjects/src/TotemFramePosition.cc
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
*
****************************************************************************/

#include "CondFormats/TotemReadoutObjects/interface/TotemFramePosition.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h"

#include <iomanip>
#include <cstdlib>
Expand Down
2 changes: 1 addition & 1 deletion ...ts/TotemReadoutObjects/src/TotemSymbId.cc → ...ts/CTPPSReadoutObjects/src/TotemSymbId.cc
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
*
****************************************************************************/

#include "CondFormats/TotemReadoutObjects/interface/TotemSymbId.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemSymbId.h"

std::ostream& operator << (std::ostream& s, const TotemSymbID &sid)
{
Expand Down
0 ...mReadoutObjects/xml/ctpps_210_mapping.xml → ...SReadoutObjects/xml/ctpps_210_mapping.xml
View file
Open in desktop
File renamed without changes.
0 ...doutObjects/xml/totem_rp_mask_example.xml → ...doutObjects/xml/totem_rp_mask_example.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Configuration/StandardSequences/python/RawToDigi_cff.py
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
tcdsDigis = EventFilter.Utilities.tcdsRawToDigi_cfi.tcdsRawToDigi.clone()

from L1Trigger.Configuration.L1TRawToDigi_cff import *
from EventFilter.TotemRawToDigi.totemRawToDigi_cff import *
from EventFilter.CTPPSRawToDigi.totemRawToDigi_cff import *

RawToDigi = cms.Sequence(L1TRawToDigi
+siPixelDigis
Expand Down
4 changes: 2 additions & 2 deletions DQM/CTPPS/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
<use name="DQMServices/Core"/>

<use name="DataFormats/Common"/>
<use name="DataFormats/TotemRPDetId"/>
<use name="DataFormats/TotemDigi"/>
<use name="DataFormats/CTPPSDetId"/>
<use name="DataFormats/CTPPSDigi"/>
<use name="DataFormats/CTPPSReco"/>

<use name="Geometry/Records"/>
Expand Down
4 changes: 2 additions & 2 deletions DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/MonitorElement.h"

#include "DataFormats/TotemDigi/interface/TotemFEDInfo.h"
#include "DataFormats/TotemDigi/interface/TotemTriggerCounters.h"
#include "DataFormats/CTPPSDigi/interface/TotemFEDInfo.h"
#include "DataFormats/CTPPSDigi/interface/TotemTriggerCounters.h"

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion DQM/CTPPS/plugins/TotemRPDQMHarvester.cc
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
#include "DQMServices/Core/interface/DQMStore.h"
#include "DQMServices/Core/interface/MonitorElement.h"

#include "DataFormats/TotemRPDetId/interface/TotemRPDetId.h"
#include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"

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

Expand Down
6 changes: 3 additions & 3 deletions DQM/CTPPS/plugins/TotemRPDQMSource.cc
View file
Open in desktop
Expand Up @@ -19,9 +19,9 @@
#include "DQMServices/Core/interface/MonitorElement.h"

#include "DataFormats/Common/interface/DetSetVector.h"
#include "DataFormats/TotemRPDetId/interface/TotemRPDetId.h"
#include "DataFormats/TotemDigi/interface/TotemRPDigi.h"
#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"
#include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h"
#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSReco/interface/TotemRPCluster.h"
#include "DataFormats/CTPPSReco/interface/TotemRPRecHit.h"
#include "DataFormats/CTPPSReco/interface/TotemRPUVPattern.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/CTPPS/test/dqm_test_cfg.py
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
)

# raw-to-digi conversion
process.load("EventFilter.TotemRawToDigi.totemRawToDigi_cff")
process.load("EventFilter.CTPPSRawToDigi.totemRawToDigi_cff")

# local RP reconstruction chain with standard settings
process.load("RecoCTPPS.Configuration.recoCTPPS_cff")
Expand Down
2 changes: 1 addition & 1 deletion DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")

# raw-to-digi conversion
process.load("EventFilter.TotemRawToDigi.totemRawToDigi_cff")
process.load("EventFilter.CTPPSRawToDigi.totemRawToDigi_cff")

# local RP reconstruction chain with standard settings
process.load("RecoCTPPS.Configuration.recoCTPPS_cff")
Expand Down
0 DataFormats/TotemRPDetId/BuildFile.xml → DataFormats/CTPPSDetId/BuildFile.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ats/TotemRPDetId/interface/TotemRPDetId.h → ...rmats/CTPPSDetId/interface/TotemRPDetId.h
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@
*
****************************************************************************/

#ifndef DataFormats_TotemRPDetId_TotemRPDetId
#define DataFormats_TotemRPDetId_TotemRPDetId
#ifndef DataFormats_CTPPSDetId_CTPPSDetId
#define DataFormats_CTPPSDetId_CTPPSDetId

#include "DataFormats/DetId/interface/DetId.h"

Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TotemRPDetId/src/TotemRPDetId.cc → DataFormats/CTPPSDetId/src/TotemRPDetId.cc
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
****************************************************************************/


#include "DataFormats/TotemRPDetId/interface/TotemRPDetId.h"
#include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"
#include "FWCore/Utilities/interface/Exception.h"

using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TotemRPDetId/src/classes.h → DataFormats/CTPPSDetId/src/classes.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#include "DataFormats/TotemRPDetId/interface/TotemRPDetId.h"
#include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"

namespace DataFormats_TotemRPDetId {
struct dictionary {
Expand Down
0 DataFormats/TotemRPDetId/src/classes_def.xml → DataFormats/CTPPSDetId/src/classes_def.xml
View file
Open in desktop
File renamed without changes.
0 DataFormats/TotemDigi/BuildFile.xml → DataFormats/CTPPSDigi/BuildFile.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ormats/TotemDigi/interface/TotemFEDInfo.h → ...ormats/CTPPSDigi/interface/TotemFEDInfo.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
****************************************************************************/

#ifndef DataFormats_TotemDigi_TotemFEDInfo
#define DataFormats_TotemDigi_TotemFEDInfo
#ifndef DataFormats_CTPPSDigi_TotemFEDInfo
#define DataFormats_CTPPSDigi_TotemFEDInfo

/**
* \brief OptoRx headers and footers.
Expand Down
4 changes: 2 additions & 2 deletions ...Formats/TotemDigi/interface/TotemRPDigi.h → ...Formats/CTPPSDigi/interface/TotemRPDigi.h
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@
*
****************************************************************************/

#ifndef DataFormats_TotemDigi_TotemRPDigi
#define DataFormats_TotemDigi_TotemRPDigi
#ifndef DataFormats_CTPPSDigi_TotemRPDigi
#define DataFormats_CTPPSDigi_TotemRPDigi

/**
* Digi structure for TOTEM RP silicon strip sensors.
Expand Down
4 changes: 2 additions & 2 deletions ...otemDigi/interface/TotemTriggerCounters.h → ...TPPSDigi/interface/TotemTriggerCounters.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
****************************************************************************/

#ifndef DataFormats_TotemDigi_TotemTriggerCounters
#define DataFormats_TotemDigi_TotemTriggerCounters
#ifndef DataFormats_CTPPSDigi_TotemTriggerCounters
#define DataFormats_CTPPSDigi_TotemTriggerCounters

/**
* Trigger counters from LoneG.
Expand Down
4 changes: 2 additions & 2 deletions ...ats/TotemDigi/interface/TotemVFATStatus.h → ...ats/CTPPSDigi/interface/TotemVFATStatus.h
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@
*
****************************************************************************/

#ifndef DataFormats_TotemDigi_TotemVFATStatus
#define DataFormats_TotemDigi_TotemVFATStatus
#ifndef DataFormats_CTPPSDigi_TotemVFATStatus
#define DataFormats_CTPPSDigi_TotemVFATStatus

#include <bitset>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/TotemDigi/src/TotemVFATStatus.cc → DataFormats/CTPPSDigi/src/TotemVFATStatus.cc
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
*
****************************************************************************/

#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"

#include <ostream>

Expand Down
8 changes: 4 additions & 4 deletions DataFormats/TotemDigi/src/classes.h → DataFormats/CTPPSDigi/src/classes.h
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@
#include "DataFormats/Common/interface/DetSet.h"
#include "DataFormats/Common/interface/DetSetVector.h"

#include "DataFormats/TotemDigi/interface/TotemRPDigi.h"
#include "DataFormats/TotemDigi/interface/TotemTriggerCounters.h"
#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
#include "DataFormats/TotemDigi/interface/TotemFEDInfo.h"
#include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h"
#include "DataFormats/CTPPSDigi/interface/TotemTriggerCounters.h"
#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSDigi/interface/TotemFEDInfo.h"

#include <vector>

Expand Down
0 DataFormats/TotemDigi/src/classes_def.xml → DataFormats/CTPPSDigi/src/classes_def.xml
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions EventFilter/TotemRawToDigi/BuildFile.xml → EventFilter/CTPPSRawToDigi/BuildFile.xml
View file
Open in desktop
Expand Up @@ -5,10 +5,10 @@
<use name="DataFormats/FEDRawData"/>
<use name="DataFormats/Common"/>

<use name="DataFormats/TotemDigi"/>
<use name="DataFormats/TotemRPDetId"/>
<use name="DataFormats/CTPPSDigi"/>
<use name="DataFormats/CTPPSDetId"/>

<use name="CondFormats/TotemReadoutObjects"/>
<use name="CondFormats/CTPPSReadoutObjects"/>

<export>
<lib name="1"/>
Expand Down
8 changes: 4 additions & 4 deletions ...TotemRawToDigi/interface/CounterChecker.h → ...CTPPSRawToDigi/interface/CounterChecker.h
View file
Open in desktop
Expand Up @@ -7,17 +7,17 @@
*
****************************************************************************/

#ifndef EventFilter_TotemRawToDigi_CounterChecker
#define EventFilter_TotemRawToDigi_CounterChecker
#ifndef EventFilter_CTPPSRawToDigi_CounterChecker
#define EventFilter_CTPPSRawToDigi_CounterChecker

#include <map>
#include <string>
#include <vector>
#include <iostream>

#include "CondFormats/TotemReadoutObjects/interface/TotemFramePosition.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h"

#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"

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

Expand Down
10 changes: 5 additions & 5 deletions ...otemRawToDigi/interface/RawDataUnpacker.h → ...TPPSRawToDigi/interface/RawDataUnpacker.h
View file
Open in desktop
Expand Up @@ -6,16 +6,16 @@
*
****************************************************************************/

#ifndef EventFilter_TotemRawToDigi_RawDataUnpacker
#define EventFilter_TotemRawToDigi_RawDataUnpacker
#ifndef EventFilter_CTPPSRawToDigi_RawDataUnpacker
#define EventFilter_CTPPSRawToDigi_RawDataUnpacker

#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/FEDRawData/interface/FEDRawData.h"
#include "DataFormats/TotemDigi/interface/TotemFEDInfo.h"
#include "DataFormats/CTPPSDigi/interface/TotemFEDInfo.h"

#include "EventFilter/TotemRawToDigi/interface/VFATFrameCollection.h"
#include "EventFilter/TotemRawToDigi/interface/SimpleVFATFrameCollection.h"
#include "EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h"
#include "EventFilter/CTPPSRawToDigi/interface/SimpleVFATFrameCollection.h"

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

Expand Down
14 changes: 7 additions & 7 deletions ...mRawToDigi/interface/RawToDigiConverter.h → ...SRawToDigi/interface/RawToDigiConverter.h
View file
Open in desktop
Expand Up @@ -6,19 +6,19 @@
*
****************************************************************************/

#ifndef EventFilter_TotemRawToDigi_RawToDigiConverter
#define EventFilter_TotemRawToDigi_RawToDigiConverter
#ifndef EventFilter_CTPPSRawToDigi_RawToDigiConverter
#define EventFilter_CTPPSRawToDigi_RawToDigiConverter

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/Common/interface/DetSetVector.h"

#include "EventFilter/TotemRawToDigi/interface/VFATFrameCollection.h"
#include "EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h"

#include "CondFormats/TotemReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/TotemReadoutObjects/interface/TotemAnalysisMask.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h"
#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h"

#include "DataFormats/TotemDigi/interface/TotemRPDigi.h"
#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
#include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h"
#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"

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

Expand Down
6 changes: 3 additions & 3 deletions ...igi/interface/SimpleVFATFrameCollection.h → ...igi/interface/SimpleVFATFrameCollection.h
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@
****************************************************************************/


#ifndef EventFilter_TotemRawToDigi_SimpleVFATFrameCollection
#define EventFilter_TotemRawToDigi_SimpleVFATFrameCollection
#ifndef EventFilter_CTPPSRawToDigi_SimpleVFATFrameCollection
#define EventFilter_CTPPSRawToDigi_SimpleVFATFrameCollection

#include "EventFilter/TotemRawToDigi/interface/VFATFrameCollection.h"
#include "EventFilter/CTPPSRawToDigi/interface/VFATFrameCollection.h"

#include <map>

Expand Down
4 changes: 2 additions & 2 deletions ...lter/TotemRawToDigi/interface/VFATFrame.h → ...lter/CTPPSRawToDigi/interface/VFATFrame.h
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@
*
**********************************************************/

#ifndef EventFilter_TotemRawToDigi_VFATFrame
#define EventFilter_TotemRawToDigi_VFATFrame
#ifndef EventFilter_CTPPSRawToDigi_VFATFrame
#define EventFilter_CTPPSRawToDigi_VFATFrame

#include <vector>
#include <cstddef>
Expand Down