From 2b6858f48a68d318000f600a25c8c7d2e676569c Mon Sep 17 00:00:00 2001
From: "Ian J. Watson" <ian.james.watson@cern.ch>
Date: Thu, 16 Jul 2020 14:28:21 +0900
Subject: [PATCH 1/3] Move dictionary generating classes from
 EventFilter/GEMRawToDigi to DataFormats/GEMDigi and update references

---
 DQM/GEM/plugins/GEMDQMStatusDigi.cc           |  6 +--
 .../GEMDigi}/interface/AMC13Event.h           |  0
 .../GEMDigi}/interface/AMCdata.h              |  0
 .../GEMDigi}/interface/GEBdata.h              |  0
 .../interface/GEMAMC13EventCollection.h       |  2 +-
 .../GEMDigi}/interface/GEMAMCdataCollection.h |  2 +-
 .../GEMDigi}/interface/GEMGEBdataCollection.h |  2 +-
 .../GEMDigi}/interface/GEMVfatStatusDigi.h    |  2 +-
 .../interface/GEMVfatStatusDigiCollection.h   |  2 +-
 .../GEMDigi}/interface/VFATdata.h             |  0
 .../GEMDigi}/src/AMC13Event.cc                |  0
 .../GEMDigi}/src/AMCdata.cc                   |  0
 .../GEMDigi}/src/GEMVfatStatusDigi.cc         |  0
 .../GEMDigi}/src/VFATdata.cc                  |  0
 DataFormats/GEMDigi/src/classes.h             | 12 +++++
 DataFormats/GEMDigi/src/classes_def.xml       | 33 ++++++++++++
 EventFilter/GEMRawToDigi/BuildFile.xml        |  1 +
 .../GEMRawToDigi/interface/GEMRawToDigi.h     |  2 +-
 .../GEMRawToDigi/plugins/GEMDigiToRawModule.h |  2 +-
 .../GEMRawToDigi/plugins/GEMRawToDigiModule.h | 13 ++---
 EventFilter/GEMRawToDigi/src/classes.h        | 14 -----
 EventFilter/GEMRawToDigi/src/classes_def.xml  | 53 -------------------
 22 files changed, 63 insertions(+), 83 deletions(-)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/AMC13Event.h (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/AMCdata.h (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEBdata.h (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEMAMC13EventCollection.h (81%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEMAMCdataCollection.h (81%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEMGEBdataCollection.h (84%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEMVfatStatusDigi.h (92%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/GEMVfatStatusDigiCollection.h (83%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/interface/VFATdata.h (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/src/AMC13Event.cc (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/src/AMCdata.cc (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/src/GEMVfatStatusDigi.cc (100%)
 rename {EventFilter/GEMRawToDigi => DataFormats/GEMDigi}/src/VFATdata.cc (100%)
 delete mode 100644 EventFilter/GEMRawToDigi/src/classes.h
 delete mode 100644 EventFilter/GEMRawToDigi/src/classes_def.xml

diff --git a/DQM/GEM/plugins/GEMDQMStatusDigi.cc b/DQM/GEM/plugins/GEMDQMStatusDigi.cc
index 9cc60c784b928..eed8422e5dbb8 100644
--- a/DQM/GEM/plugins/GEMDQMStatusDigi.cc
+++ b/DQM/GEM/plugins/GEMDQMStatusDigi.cc
@@ -14,9 +14,9 @@
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMGEBdataCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMAMCdataCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 
 #include <string>
diff --git a/EventFilter/GEMRawToDigi/interface/AMC13Event.h b/DataFormats/GEMDigi/interface/AMC13Event.h
similarity index 100%
rename from EventFilter/GEMRawToDigi/interface/AMC13Event.h
rename to DataFormats/GEMDigi/interface/AMC13Event.h
diff --git a/EventFilter/GEMRawToDigi/interface/AMCdata.h b/DataFormats/GEMDigi/interface/AMCdata.h
similarity index 100%
rename from EventFilter/GEMRawToDigi/interface/AMCdata.h
rename to DataFormats/GEMDigi/interface/AMCdata.h
diff --git a/EventFilter/GEMRawToDigi/interface/GEBdata.h b/DataFormats/GEMDigi/interface/GEBdata.h
similarity index 100%
rename from EventFilter/GEMRawToDigi/interface/GEBdata.h
rename to DataFormats/GEMDigi/interface/GEBdata.h
diff --git a/EventFilter/GEMRawToDigi/interface/GEMAMC13EventCollection.h b/DataFormats/GEMDigi/interface/GEMAMC13EventCollection.h
similarity index 81%
rename from EventFilter/GEMRawToDigi/interface/GEMAMC13EventCollection.h
rename to DataFormats/GEMDigi/interface/GEMAMC13EventCollection.h
index ea2b1eb1453fd..2eb053e303f3b 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMAMC13EventCollection.h
+++ b/DataFormats/GEMDigi/interface/GEMAMC13EventCollection.h
@@ -2,7 +2,7 @@
 #define DataFormats_GEMDigi_GEMAMC13EventCollection_h
 
 #include "DataFormats/MuonData/interface/MuonDigiCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
 
 typedef MuonDigiCollection<uint16_t, gem::AMC13Event> GEMAMC13EventCollection;
 
diff --git a/EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h b/DataFormats/GEMDigi/interface/GEMAMCdataCollection.h
similarity index 81%
rename from EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h
rename to DataFormats/GEMDigi/interface/GEMAMCdataCollection.h
index 6c34d3e5d92ba..3065dd3dc5306 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h
+++ b/DataFormats/GEMDigi/interface/GEMAMCdataCollection.h
@@ -2,7 +2,7 @@
 #define DataFormats_GEMDigi_GEMAMCdataCollection_h
 
 #include "DataFormats/MuonData/interface/MuonDigiCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/AMCdata.h"
+#include "DataFormats/GEMDigi/interface/AMCdata.h"
 
 typedef MuonDigiCollection<uint16_t, gem::AMCdata> GEMAMCdataCollection;
 
diff --git a/EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h b/DataFormats/GEMDigi/interface/GEMGEBdataCollection.h
similarity index 84%
rename from EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h
rename to DataFormats/GEMDigi/interface/GEMGEBdataCollection.h
index ba9b3cd8ef7a9..c18a7176363ad 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h
+++ b/DataFormats/GEMDigi/interface/GEMGEBdataCollection.h
@@ -1,7 +1,7 @@
 #ifndef DataFormats_GEMDigi_GEMGEBdataCollection_h
 #define DataFormats_GEMDigi_GEMGEBdataCollection_h
 
-#include "EventFilter/GEMRawToDigi/interface/GEBdata.h"
+#include "DataFormats/GEMDigi/interface/GEBdata.h"
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
 #include "DataFormats/MuonData/interface/MuonDigiCollection.h"
 
diff --git a/EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h b/DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h
similarity index 92%
rename from EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h
rename to DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h
index be540261d7386..6cb72edbef637 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h
+++ b/DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h
@@ -2,7 +2,7 @@
 #define DataFormats_GEMDigi_GEMVfatStatusDigi_H
 
 #include <cstdint>
-#include "EventFilter/GEMRawToDigi/interface/VFATdata.h"
+#include "DataFormats/GEMDigi/interface/VFATdata.h"
 
 class GEMVfatStatusDigi {
 public:
diff --git a/EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h b/DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h
similarity index 83%
rename from EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h
rename to DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h
index 36e50dc814745..2fd3b2527b8bc 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h
+++ b/DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h
@@ -1,7 +1,7 @@
 #ifndef DataFormats_GEMDigi_GEMVfatStatusDigiCollection_h
 #define DataFormats_GEMDigi_GEMVfatStatusDigiCollection_h
 
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h"
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h"
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
 #include "DataFormats/MuonData/interface/MuonDigiCollection.h"
 
diff --git a/EventFilter/GEMRawToDigi/interface/VFATdata.h b/DataFormats/GEMDigi/interface/VFATdata.h
similarity index 100%
rename from EventFilter/GEMRawToDigi/interface/VFATdata.h
rename to DataFormats/GEMDigi/interface/VFATdata.h
diff --git a/EventFilter/GEMRawToDigi/src/AMC13Event.cc b/DataFormats/GEMDigi/src/AMC13Event.cc
similarity index 100%
rename from EventFilter/GEMRawToDigi/src/AMC13Event.cc
rename to DataFormats/GEMDigi/src/AMC13Event.cc
diff --git a/EventFilter/GEMRawToDigi/src/AMCdata.cc b/DataFormats/GEMDigi/src/AMCdata.cc
similarity index 100%
rename from EventFilter/GEMRawToDigi/src/AMCdata.cc
rename to DataFormats/GEMDigi/src/AMCdata.cc
diff --git a/EventFilter/GEMRawToDigi/src/GEMVfatStatusDigi.cc b/DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
similarity index 100%
rename from EventFilter/GEMRawToDigi/src/GEMVfatStatusDigi.cc
rename to DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
diff --git a/EventFilter/GEMRawToDigi/src/VFATdata.cc b/DataFormats/GEMDigi/src/VFATdata.cc
similarity index 100%
rename from EventFilter/GEMRawToDigi/src/VFATdata.cc
rename to DataFormats/GEMDigi/src/VFATdata.cc
diff --git a/DataFormats/GEMDigi/src/classes.h b/DataFormats/GEMDigi/src/classes.h
index 5a6d09253160b..71ceaac2c9c68 100644
--- a/DataFormats/GEMDigi/src/classes.h
+++ b/DataFormats/GEMDigi/src/classes.h
@@ -10,6 +10,18 @@
 #include "DataFormats/GEMDigi/interface/GEMCoPadDigi.h"
 #include "DataFormats/GEMDigi/interface/GEMCoPadDigiCollection.h"
 
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h"
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h"
+
+#include "DataFormats/GEMDigi/interface/GEBdata.h"
+#include "DataFormats/GEMDigi/interface/GEMGEBdataCollection.h"
+
+#include "DataFormats/GEMDigi/interface/AMCdata.h"
+#include "DataFormats/GEMDigi/interface/GEMAMCdataCollection.h"
+
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
+#include "DataFormats/GEMDigi/interface/GEMAMC13EventCollection.h"
+
 #include "DataFormats/GEMDigi/interface/ME0DigiPreReco.h"
 #include "DataFormats/GEMDigi/interface/ME0DigiPreRecoCollection.h"
 
diff --git a/DataFormats/GEMDigi/src/classes_def.xml b/DataFormats/GEMDigi/src/classes_def.xml
index 91df7a2e417a7..025e60d2614e5 100644
--- a/DataFormats/GEMDigi/src/classes_def.xml
+++ b/DataFormats/GEMDigi/src/classes_def.xml
@@ -36,6 +36,39 @@
 <class name="MuonDigiCollection<GEMDetId,GEMCoPadDigi>"/>
 <class name="edm::Wrapper<MuonDigiCollection<GEMDetId,GEMCoPadDigi> >" splitLevel="0"/>
 
+<class name="GEMVfatStatusDigi" ClassVersion="4">
+ <version ClassVersion="4" checksum="1981269550"/>
+ <version ClassVersion="3" checksum="569767420"/>
+</class>
+<class name="std::vector<GEMVfatStatusDigi>"/>
+<class name="std::map<GEMDetId,std::vector<GEMVfatStatusDigi> >"/>
+<class name="MuonDigiCollection<GEMDetId,GEMVfatStatusDigi>"/> 
+<class name="edm::Wrapper<MuonDigiCollection<GEMDetId,GEMVfatStatusDigi> >" splitLevel="0"/> 
+
+<class name="gem::GEBdata" ClassVersion="3">
+  <version ClassVersion="3" checksum="3127786112"/>
+</class>
+<class name="std::vector<gem::GEBdata>"/>
+<class name="std::map<GEMDetId,std::vector<gem::GEBdata> >"/>
+<class name="MuonDigiCollection<GEMDetId, gem::GEBdata>"/>
+<class name="edm::Wrapper<MuonDigiCollection<GEMDetId, gem::GEBdata> >" splitLevel="0"/>
+
+<class name="gem::AMCdata" ClassVersion="3">
+ <version ClassVersion="3" checksum="3993922227"/>
+</class>
+<class name="std::vector<gem::AMCdata>"/>
+<class name="std::map<uint16_t,std::vector<gem::AMCdata> >"/>
+<class name="MuonDigiCollection<uint16_t,gem::AMCdata>"/>
+<class name="edm::Wrapper<MuonDigiCollection<uint16_t,gem::AMCdata> >" splitLevel="0"/>
+
+<class name="gem::AMC13Event" ClassVersion="3">
+ <version ClassVersion="3" checksum="1324062162"/>
+</class>
+<class name="std::vector<gem::AMC13Event>"/>
+<class name="std::map<uint16_t,std::vector<gem::AMC13Event> >"/>
+<class name="MuonDigiCollection<uint16_t,gem::AMC13Event>"/>
+<class name="edm::Wrapper<MuonDigiCollection<uint16_t,gem::AMC13Event> >" splitLevel="0"/>
+
 <class name="ME0DigiPreReco" ClassVersion="13">
  <version ClassVersion="10" checksum="79088950"/>
  <version ClassVersion="11" checksum="1930707888"/>
diff --git a/EventFilter/GEMRawToDigi/BuildFile.xml b/EventFilter/GEMRawToDigi/BuildFile.xml
index 1208bb7a7ad67..9a6ddc7822566 100644
--- a/EventFilter/GEMRawToDigi/BuildFile.xml
+++ b/EventFilter/GEMRawToDigi/BuildFile.xml
@@ -10,6 +10,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/MuonData"/>
 <use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/GEMDigi"/>
 <use name="rootrflx"/>
 <use name="boost"/>
 <use name="root"/>
diff --git a/EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h b/EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h
index 93061e3b42896..4aa9e5d10019d 100644
--- a/EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h
+++ b/EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h
@@ -4,7 +4,7 @@
  *  \author J. Lee, Yechan Kang - UoS
  */
 #include <memory>
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
 
 class GEMRawToDigi {
 public:
diff --git a/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.h b/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.h
index 4a07fc2d0871c..e7eedace5da3a 100644
--- a/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.h
+++ b/EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.h
@@ -15,8 +15,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
 
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
 #include "CondFormats/DataRecord/interface/GEMeMapRcd.h"
 #include "CondFormats/GEMObjects/interface/GEMeMap.h"
 #include "CondFormats/GEMObjects/interface/GEMROMapping.h"
diff --git a/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.h b/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.h
index 49da09b886e28..a5ec1d7d398d1 100644
--- a/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.h
+++ b/EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.h
@@ -14,17 +14,18 @@
 
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMAMC13EventCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigiCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMGEBdataCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMAMCdataCollection.h"
+#include "DataFormats/GEMDigi/interface/GEMAMC13EventCollection.h"
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
+#include "DataFormats/GEMDigi/interface/VFATdata.h"
+
 #include "EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h"
 
 #include "CondFormats/DataRecord/interface/GEMeMapRcd.h"
 #include "CondFormats/GEMObjects/interface/GEMeMap.h"
 #include "CondFormats/GEMObjects/interface/GEMROMapping.h"
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
-#include "EventFilter/GEMRawToDigi/interface/VFATdata.h"
 
 class GEMRawToDigiModule : public edm::global::EDProducer<edm::RunCache<GEMROMapping> > {
 public:
diff --git a/EventFilter/GEMRawToDigi/src/classes.h b/EventFilter/GEMRawToDigi/src/classes.h
deleted file mode 100644
index 747f4509e1804..0000000000000
--- a/EventFilter/GEMRawToDigi/src/classes.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigiCollection.h"
-
-#include "EventFilter/GEMRawToDigi/interface/GEBdata.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMGEBdataCollection.h"
-
-#include "EventFilter/GEMRawToDigi/interface/AMCdata.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMAMCdataCollection.h"
-
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
-#include "EventFilter/GEMRawToDigi/interface/GEMAMC13EventCollection.h"
-
-#include "DataFormats/Common/interface/Wrapper.h"
-#include <vector>
diff --git a/EventFilter/GEMRawToDigi/src/classes_def.xml b/EventFilter/GEMRawToDigi/src/classes_def.xml
deleted file mode 100644
index cd8951aee8bad..0000000000000
--- a/EventFilter/GEMRawToDigi/src/classes_def.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<lcgdict>
-
-<class name="GEMVfatStatusDigi" ClassVersion="4">
- <version ClassVersion="4" checksum="1981269550"/>
- <version ClassVersion="3" checksum="569767420"/>
-</class>
-<class name="std::vector<GEMVfatStatusDigi>"/>
-<class name="std::map<GEMDetId,std::vector<GEMVfatStatusDigi> >"/>
-<class name="MuonDigiCollection<GEMDetId,GEMVfatStatusDigi>"/> 
-<class name="edm::Wrapper<MuonDigiCollection<GEMDetId,GEMVfatStatusDigi> >" splitLevel="0"/> 
-
-<class name="gem::GEBdata" ClassVersion="3">
-  <version ClassVersion="3" checksum="3127786112"/>
- <!--
-  <field name="ch_" iotype="gem::GEBchamberHeader" />
-  <field name="ct_" iotype="gem::GEBchamberTrailer" />
-  -->
-</class>
-<class name="std::vector<gem::GEBdata>"/>
-<class name="std::map<GEMDetId,std::vector<gem::GEBdata> >"/>
-<class name="MuonDigiCollection<GEMDetId, gem::GEBdata>"/>
-<class name="edm::Wrapper<MuonDigiCollection<GEMDetId, gem::GEBdata> >" splitLevel="0"/>
-
-<class name="gem::AMCdata" ClassVersion="3">
- <version ClassVersion="3" checksum="3993922227"/>
- <!--
-     <field name="amch1_" iotype="gem::AMCheader1" />
-  <field name="amch2_" iotype="gem::AMCheader2" />
-  <field name="amct_" iotype="gem::AMCTrailer" />
-  <field name="eh_" iotype="gem::EventHeader" />
-  <field name="et_" iotype="gem::EventTrailer" />
-  -->
-</class>
-<class name="std::vector<gem::AMCdata>"/>
-<class name="std::map<uint16_t,std::vector<gem::AMCdata> >"/>
-<class name="MuonDigiCollection<uint16_t,gem::AMCdata>"/>
-<class name="edm::Wrapper<MuonDigiCollection<uint16_t,gem::AMCdata> >" splitLevel="0"/>
-
-<class name="gem::AMC13Event" ClassVersion="3">
- <version ClassVersion="3" checksum="1324062162"/>
- <!--
-  <field name="cdfh_" iotype="gem::CDFHeader" />
-  <field name="amc13h_" iotype="gem::AMC13Header" />
-  <field name="amc13t_" iotype="gem::AMC13Trailer" />
-  <field name="cdft_" iotype="gem::CDFTrailer" />
-  -->
-</class>
-<class name="std::vector<gem::AMC13Event>"/>
-<class name="std::map<uint16_t,std::vector<gem::AMC13Event> >"/>
-<class name="MuonDigiCollection<uint16_t,gem::AMC13Event>"/>
-<class name="edm::Wrapper<MuonDigiCollection<uint16_t,gem::AMC13Event> >" splitLevel="0"/>
-
-</lcgdict>

From 82e0697782deaf54b8b64aa1361a2d7059ddc20a Mon Sep 17 00:00:00 2001
From: "Ian J. Watson" <ian.james.watson@cern.ch>
Date: Thu, 16 Jul 2020 14:48:02 +0900
Subject: [PATCH 2/3] Fix some header paths

---
 DataFormats/GEMDigi/src/AMC13Event.cc        | 2 +-
 DataFormats/GEMDigi/src/AMCdata.cc           | 2 +-
 DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc | 2 +-
 DataFormats/GEMDigi/src/VFATdata.cc          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DataFormats/GEMDigi/src/AMC13Event.cc b/DataFormats/GEMDigi/src/AMC13Event.cc
index 90787eefc88ac..171af2c09a919 100644
--- a/DataFormats/GEMDigi/src/AMC13Event.cc
+++ b/DataFormats/GEMDigi/src/AMC13Event.cc
@@ -1,5 +1,5 @@
 #include <cstdint>
-#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
+#include "DataFormats/GEMDigi/interface/AMC13Event.h"
 
 using namespace gem;
 
diff --git a/DataFormats/GEMDigi/src/AMCdata.cc b/DataFormats/GEMDigi/src/AMCdata.cc
index 2da092eb5fd36..538f6510273b0 100644
--- a/DataFormats/GEMDigi/src/AMCdata.cc
+++ b/DataFormats/GEMDigi/src/AMCdata.cc
@@ -1,5 +1,5 @@
 #include <cstdint>
-#include "EventFilter/GEMRawToDigi/interface/AMCdata.h"
+#include "DataFormats/GEMDigi/interface/AMCdata.h"
 
 using namespace gem;
 
diff --git a/DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc b/DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
index 4ff843e44452a..0f39fc7488787 100644
--- a/DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
+++ b/DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
@@ -1,4 +1,4 @@
-#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h"
+#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h"
 #include <iostream>
 
 GEMVfatStatusDigi::GEMVfatStatusDigi(gem::VFATdata &vfat) {
diff --git a/DataFormats/GEMDigi/src/VFATdata.cc b/DataFormats/GEMDigi/src/VFATdata.cc
index 5a83ab3f6c650..0141261cb21a8 100644
--- a/DataFormats/GEMDigi/src/VFATdata.cc
+++ b/DataFormats/GEMDigi/src/VFATdata.cc
@@ -1,4 +1,4 @@
-#include "EventFilter/GEMRawToDigi/interface/VFATdata.h"
+#include "DataFormats/GEMDigi/interface/VFATdata.h"
 #include <iostream>
 using namespace gem;
 

From 1823c7fb213c6e0dea09c56c6cf9eac7593ea6e8 Mon Sep 17 00:00:00 2001
From: "Ian J. Watson" <ian.james.watson@cern.ch>
Date: Fri, 17 Jul 2020 15:40:20 +0900
Subject: [PATCH 3/3] Change the header guards to match new location

---
 DataFormats/GEMDigi/interface/AMC13Event.h | 4 ++--
 DataFormats/GEMDigi/interface/AMCdata.h    | 4 ++--
 DataFormats/GEMDigi/interface/GEBdata.h    | 4 ++--
 DataFormats/GEMDigi/interface/VFATdata.h   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/DataFormats/GEMDigi/interface/AMC13Event.h b/DataFormats/GEMDigi/interface/AMC13Event.h
index 0ba9c054f2fab..3f05e675acc48 100644
--- a/DataFormats/GEMDigi/interface/AMC13Event.h
+++ b/DataFormats/GEMDigi/interface/AMC13Event.h
@@ -1,5 +1,5 @@
-#ifndef EventFilter_GEMRawToDigi_AMC13Event_h
-#define EventFilter_GEMRawToDigi_AMC13Event_h
+#ifndef DataFormats_GEMDigi_AMC13Event_h
+#define DataFormats_GEMDigi_AMC13Event_h
 #include <vector>
 #include "AMCdata.h"
 
diff --git a/DataFormats/GEMDigi/interface/AMCdata.h b/DataFormats/GEMDigi/interface/AMCdata.h
index 821ab09c8eed3..016c0e077d859 100644
--- a/DataFormats/GEMDigi/interface/AMCdata.h
+++ b/DataFormats/GEMDigi/interface/AMCdata.h
@@ -1,5 +1,5 @@
-#ifndef EventFilter_GEMRawToDigi_AMCdata_h
-#define EventFilter_GEMRawToDigi_AMCdata_h
+#ifndef DataFormats_GEMDigi_AMCdata_h
+#define DataFormats_GEMDigi_AMCdata_h
 #include "GEBdata.h"
 #include <vector>
 
diff --git a/DataFormats/GEMDigi/interface/GEBdata.h b/DataFormats/GEMDigi/interface/GEBdata.h
index 887160df293ac..884f6f324d246 100644
--- a/DataFormats/GEMDigi/interface/GEBdata.h
+++ b/DataFormats/GEMDigi/interface/GEBdata.h
@@ -1,5 +1,5 @@
-#ifndef EventFilter_GEMRawToDigi_GEBdata_h
-#define EventFilter_GEMRawToDigi_GEBdata_h
+#ifndef DataFormats_GEMDigi_GEBdata_h
+#define DataFormats_GEMDigi_GEBdata_h
 #include "VFATdata.h"
 #include <vector>
 
diff --git a/DataFormats/GEMDigi/interface/VFATdata.h b/DataFormats/GEMDigi/interface/VFATdata.h
index 4d562757f3801..de6f48a65be55 100644
--- a/DataFormats/GEMDigi/interface/VFATdata.h
+++ b/DataFormats/GEMDigi/interface/VFATdata.h
@@ -1,5 +1,5 @@
-#ifndef EventFilter_GEMRawToDigi_VFATdata_h
-#define EventFilter_GEMRawToDigi_VFATdata_h
+#ifndef DataFormats_GEMDigi_VFATdata_h
+#define DataFormats_GEMDigi_VFATdata_h
 
 #include <cstdint>