Merge pull request #15317 from CTPPS/ctpps_directory_rename_8_0_X

CTPPS: directory rename Totem -> CTPPS (back-port of #15311)
cms-sw · Aug 9, 2016 · ef4672b · ef4672b
2 parents 4f9f705 + 77d408a
commit ef4672b
Show file tree

Hide file tree

Showing 77 changed files with 159 additions and 141 deletions.
diff --git a/...Formats/TotemReadoutObjects/BuildFile.xml → ...Formats/CTPPSReadoutObjects/BuildFile.xml b/...Formats/TotemReadoutObjects/BuildFile.xml → ...Formats/CTPPSReadoutObjects/BuildFile.xml
diff --git a/...doutObjects/interface/TotemAnalysisMask.h → ...doutObjects/interface/TotemAnalysisMask.h b/...doutObjects/interface/TotemAnalysisMask.h → ...doutObjects/interface/TotemAnalysisMask.h
@@ -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>

diff --git a/...eadoutObjects/interface/TotemDAQMapping.h → ...eadoutObjects/interface/TotemDAQMapping.h b/...eadoutObjects/interface/TotemDAQMapping.h → ...eadoutObjects/interface/TotemDAQMapping.h
@@ -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>
 

diff --git a/...outObjects/interface/TotemFramePosition.h → ...outObjects/interface/TotemFramePosition.h b/...outObjects/interface/TotemFramePosition.h → ...outObjects/interface/TotemFramePosition.h
@@ -6,8 +6,8 @@
 *
 ****************************************************************************/
 
-#ifndef CondFormats_TotemReadoutObjects_TotemFramePosition
-#define CondFormats_TotemReadoutObjects_TotemFramePosition
+#ifndef CondFormats_CTPPSReadoutObjects_TotemFramePosition
+#define CondFormats_CTPPSReadoutObjects_TotemFramePosition
 
 #include <iostream>
 #include <string>

diff --git a/...temReadoutObjects/interface/TotemSymbId.h → ...PPSReadoutObjects/interface/TotemSymbId.h b/...temReadoutObjects/interface/TotemSymbId.h → ...PPSReadoutObjects/interface/TotemSymbId.h
@@ -6,8 +6,8 @@
 *
 ****************************************************************************/
 
-#ifndef CondFormats_TotemReadoutObjects_TotemSymbId
-#define CondFormats_TotemReadoutObjects_TotemSymbId
+#ifndef CondFormats_CTPPSReadoutObjects_TotemSymbId
+#define CondFormats_CTPPSReadoutObjects_TotemSymbId
 
 #include <iostream>
 

diff --git a/...TotemReadoutObjects/plugins/BuildFile.xml → ...CTPPSReadoutObjects/plugins/BuildFile.xml b/...TotemReadoutObjects/plugins/BuildFile.xml → ...CTPPSReadoutObjects/plugins/BuildFile.xml
@@ -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>
diff --git a/...utObjects/plugins/PrintTotemDAQMapping.cc → ...utObjects/plugins/PrintTotemDAQMapping.cc b/...utObjects/plugins/PrintTotemDAQMapping.cc → ...utObjects/plugins/PrintTotemDAQMapping.cc
@@ -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"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/...cts/plugins/TotemDAQMappingESSourceXML.cc → ...cts/plugins/TotemDAQMappingESSourceXML.cc b/...cts/plugins/TotemDAQMappingESSourceXML.cc → ...cts/plugins/TotemDAQMappingESSourceXML.cc
@@ -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>

diff --git a/.../python/TotemDAQMappingESSourceXML_cfi.py → .../python/TotemDAQMappingESSourceXML_cfi.py b/.../python/TotemDAQMappingESSourceXML_cfi.py → .../python/TotemDAQMappingESSourceXML_cfi.py
diff --git a/...emReadoutObjects/src/TotemAnalysisMask.cc → ...PSReadoutObjects/src/TotemAnalysisMask.cc b/...emReadoutObjects/src/TotemAnalysisMask.cc → ...PSReadoutObjects/src/TotemAnalysisMask.cc
@@ -9,7 +9,7 @@
 
 #include "FWCore/Utilities/interface/typelookup.h"
 
-#include "CondFormats/TotemReadoutObjects/interface/TotemAnalysisMask.h"
+#include "CondFormats/CTPPSReadoutObjects/interface/TotemAnalysisMask.h"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/...otemReadoutObjects/src/TotemDAQMapping.cc → ...TPPSReadoutObjects/src/TotemDAQMapping.cc b/...otemReadoutObjects/src/TotemDAQMapping.cc → ...TPPSReadoutObjects/src/TotemDAQMapping.cc
@@ -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;
 

diff --git a/...mReadoutObjects/src/TotemFramePosition.cc → ...SReadoutObjects/src/TotemFramePosition.cc b/...mReadoutObjects/src/TotemFramePosition.cc → ...SReadoutObjects/src/TotemFramePosition.cc
@@ -6,7 +6,7 @@
 *
 ****************************************************************************/
 
-#include "CondFormats/TotemReadoutObjects/interface/TotemFramePosition.h"
+#include "CondFormats/CTPPSReadoutObjects/interface/TotemFramePosition.h"
 
 #include <iomanip>
 #include <cstdlib>

diff --git a/...ts/TotemReadoutObjects/src/TotemSymbId.cc → ...ts/CTPPSReadoutObjects/src/TotemSymbId.cc b/...ts/TotemReadoutObjects/src/TotemSymbId.cc → ...ts/CTPPSReadoutObjects/src/TotemSymbId.cc
@@ -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)
 {

diff --git a/...mReadoutObjects/xml/ctpps_210_mapping.xml → ...SReadoutObjects/xml/ctpps_210_mapping.xml b/...mReadoutObjects/xml/ctpps_210_mapping.xml → ...SReadoutObjects/xml/ctpps_210_mapping.xml
diff --git a/...doutObjects/xml/totem_rp_mask_example.xml → ...doutObjects/xml/totem_rp_mask_example.xml b/...doutObjects/xml/totem_rp_mask_example.xml → ...doutObjects/xml/totem_rp_mask_example.xml
diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py
@@ -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

diff --git a/DQM/CTPPS/plugins/BuildFile.xml b/DQM/CTPPS/plugins/BuildFile.xml
@@ -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"/>

diff --git a/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc b/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc
@@ -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>
 

diff --git a/DQM/CTPPS/plugins/TotemRPDQMHarvester.cc b/DQM/CTPPS/plugins/TotemRPDQMHarvester.cc
@@ -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"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/DQM/CTPPS/plugins/TotemRPDQMSource.cc b/DQM/CTPPS/plugins/TotemRPDQMSource.cc
@@ -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"

diff --git a/DQM/CTPPS/test/dqm_test_cfg.py b/DQM/CTPPS/test/dqm_test_cfg.py
@@ -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")

diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
@@ -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")

diff --git a/DataFormats/TotemRPDetId/BuildFile.xml → DataFormats/CTPPSDetId/BuildFile.xml b/DataFormats/TotemRPDetId/BuildFile.xml → DataFormats/CTPPSDetId/BuildFile.xml
diff --git a/...ats/TotemRPDetId/interface/TotemRPDetId.h → ...rmats/CTPPSDetId/interface/TotemRPDetId.h b/...ats/TotemRPDetId/interface/TotemRPDetId.h → ...rmats/CTPPSDetId/interface/TotemRPDetId.h
@@ -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"
 

diff --git a/DataFormats/TotemRPDetId/src/TotemRPDetId.cc → DataFormats/CTPPSDetId/src/TotemRPDetId.cc b/DataFormats/TotemRPDetId/src/TotemRPDetId.cc → DataFormats/CTPPSDetId/src/TotemRPDetId.cc
@@ -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;

diff --git a/DataFormats/TotemRPDetId/src/classes.h → DataFormats/CTPPSDetId/src/classes.h b/DataFormats/TotemRPDetId/src/classes.h → DataFormats/CTPPSDetId/src/classes.h
@@ -1,4 +1,4 @@
-#include "DataFormats/TotemRPDetId/interface/TotemRPDetId.h"
+#include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"
 
 namespace DataFormats_TotemRPDetId {
   struct dictionary {

diff --git a/DataFormats/TotemRPDetId/src/classes_def.xml → DataFormats/CTPPSDetId/src/classes_def.xml b/DataFormats/TotemRPDetId/src/classes_def.xml → DataFormats/CTPPSDetId/src/classes_def.xml
diff --git a/DataFormats/TotemDigi/BuildFile.xml → DataFormats/CTPPSDigi/BuildFile.xml b/DataFormats/TotemDigi/BuildFile.xml → DataFormats/CTPPSDigi/BuildFile.xml
diff --git a/...ormats/TotemDigi/interface/TotemFEDInfo.h → ...ormats/CTPPSDigi/interface/TotemFEDInfo.h b/...ormats/TotemDigi/interface/TotemFEDInfo.h → ...ormats/CTPPSDigi/interface/TotemFEDInfo.h
@@ -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.

diff --git a/...Formats/TotemDigi/interface/TotemRPDigi.h → ...Formats/CTPPSDigi/interface/TotemRPDigi.h b/...Formats/TotemDigi/interface/TotemRPDigi.h → ...Formats/CTPPSDigi/interface/TotemRPDigi.h
@@ -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.

diff --git a/...otemDigi/interface/TotemTriggerCounters.h → ...TPPSDigi/interface/TotemTriggerCounters.h b/...otemDigi/interface/TotemTriggerCounters.h → ...TPPSDigi/interface/TotemTriggerCounters.h
@@ -6,8 +6,8 @@
 *    
 ****************************************************************************/
 
-#ifndef DataFormats_TotemDigi_TotemTriggerCounters
-#define DataFormats_TotemDigi_TotemTriggerCounters
+#ifndef DataFormats_CTPPSDigi_TotemTriggerCounters
+#define DataFormats_CTPPSDigi_TotemTriggerCounters
 
 /**
  * Trigger counters from LoneG.

diff --git a/...ats/TotemDigi/interface/TotemVFATStatus.h → ...ats/CTPPSDigi/interface/TotemVFATStatus.h b/...ats/TotemDigi/interface/TotemVFATStatus.h → ...ats/CTPPSDigi/interface/TotemVFATStatus.h
@@ -7,8 +7,8 @@
 *    
 ****************************************************************************/
 
-#ifndef DataFormats_TotemDigi_TotemVFATStatus
-#define DataFormats_TotemDigi_TotemVFATStatus
+#ifndef DataFormats_CTPPSDigi_TotemVFATStatus
+#define DataFormats_CTPPSDigi_TotemVFATStatus
 
 #include <bitset>
 #include <map>

diff --git a/DataFormats/TotemDigi/src/TotemVFATStatus.cc → DataFormats/CTPPSDigi/src/TotemVFATStatus.cc b/DataFormats/TotemDigi/src/TotemVFATStatus.cc → DataFormats/CTPPSDigi/src/TotemVFATStatus.cc
@@ -7,7 +7,7 @@
 *    
 ****************************************************************************/
 
-#include "DataFormats/TotemDigi/interface/TotemVFATStatus.h"
+#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"
 
 #include <ostream>
 

diff --git a/DataFormats/TotemDigi/src/classes.h → DataFormats/CTPPSDigi/src/classes.h b/DataFormats/TotemDigi/src/classes.h → DataFormats/CTPPSDigi/src/classes.h
@@ -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>
 

diff --git a/DataFormats/TotemDigi/src/classes_def.xml → DataFormats/CTPPSDigi/src/classes_def.xml b/DataFormats/TotemDigi/src/classes_def.xml → DataFormats/CTPPSDigi/src/classes_def.xml
diff --git a/EventFilter/TotemRawToDigi/BuildFile.xml → EventFilter/CTPPSRawToDigi/BuildFile.xml b/EventFilter/TotemRawToDigi/BuildFile.xml → EventFilter/CTPPSRawToDigi/BuildFile.xml
@@ -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"/>

diff --git a/...TotemRawToDigi/interface/CounterChecker.h → ...CTPPSRawToDigi/interface/CounterChecker.h b/...TotemRawToDigi/interface/CounterChecker.h → ...CTPPSRawToDigi/interface/CounterChecker.h
@@ -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"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/...otemRawToDigi/interface/RawDataUnpacker.h → ...TPPSRawToDigi/interface/RawDataUnpacker.h b/...otemRawToDigi/interface/RawDataUnpacker.h → ...TPPSRawToDigi/interface/RawDataUnpacker.h
@@ -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"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/...mRawToDigi/interface/RawToDigiConverter.h → ...SRawToDigi/interface/RawToDigiConverter.h b/...mRawToDigi/interface/RawToDigiConverter.h → ...SRawToDigi/interface/RawToDigiConverter.h
@@ -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"
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/...igi/interface/SimpleVFATFrameCollection.h → ...igi/interface/SimpleVFATFrameCollection.h b/...igi/interface/SimpleVFATFrameCollection.h → ...igi/interface/SimpleVFATFrameCollection.h
@@ -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>
 

diff --git a/...lter/TotemRawToDigi/interface/VFATFrame.h → ...lter/CTPPSRawToDigi/interface/VFATFrame.h b/...lter/TotemRawToDigi/interface/VFATFrame.h → ...lter/CTPPSRawToDigi/interface/VFATFrame.h
@@ -6,8 +6,8 @@
 *
 **********************************************************/
 
-#ifndef EventFilter_TotemRawToDigi_VFATFrame
-#define EventFilter_TotemRawToDigi_VFATFrame
+#ifndef EventFilter_CTPPSRawToDigi_VFATFrame
+#define EventFilter_CTPPSRawToDigi_VFATFrame
 
 #include <vector>
 #include <cstddef>