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

Move GEMDigi dictionary generating classes #30740

Merged
merged 3 commits into from
Jul 21, 2020
Merged

Move GEMDigi dictionary generating classes #30740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b6858f
Move dictionary generating classes from EventFilter/GEMRawToDigi to D…
watson-ij Jul 16, 2020
82e0697
Fix some header paths
watson-ij Jul 16, 2020
1823c7f
Change the header guards to match new location
watson-ij Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DQM/GEM/plugins/GEMDQMStatusDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...ilter/GEMRawToDigi/interface/AMC13Event.h → DataFormats/GEMDigi/interface/AMC13Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions EventFilter/GEMRawToDigi/interface/AMCdata.h → DataFormats/GEMDigi/interface/AMCdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
4 changes: 2 additions & 2 deletions EventFilter/GEMRawToDigi/interface/GEBdata.h → DataFormats/GEMDigi/interface/GEBdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion ...oDigi/interface/GEMAMC13EventCollection.h → ...MDigi/interface/GEMAMC13EventCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...awToDigi/interface/GEMAMCdataCollection.h → .../GEMDigi/interface/GEMAMCdataCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...awToDigi/interface/GEMGEBdataCollection.h → .../GEMDigi/interface/GEMGEBdataCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ...EMRawToDigi/interface/GEMVfatStatusDigi.h → ...ats/GEMDigi/interface/GEMVfatStatusDigi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...i/interface/GEMVfatStatusDigiCollection.h → ...i/interface/GEMVfatStatusDigiCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions ...tFilter/GEMRawToDigi/interface/VFATdata.h → DataFormats/GEMDigi/interface/VFATdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion EventFilter/GEMRawToDigi/src/AMC13Event.cc → DataFormats/GEMDigi/src/AMC13Event.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <cstdint>
#include "EventFilter/GEMRawToDigi/interface/AMC13Event.h"
#include "DataFormats/GEMDigi/interface/AMC13Event.h"

using namespace gem;

Expand Down
2 changes: 1 addition & 1 deletion EventFilter/GEMRawToDigi/src/AMCdata.cc → DataFormats/GEMDigi/src/AMCdata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <cstdint>
#include "EventFilter/GEMRawToDigi/interface/AMCdata.h"
#include "DataFormats/GEMDigi/interface/AMCdata.h"

using namespace gem;

Expand Down
2 changes: 1 addition & 1 deletion ...ter/GEMRawToDigi/src/GEMVfatStatusDigi.cc → DataFormats/GEMDigi/src/GEMVfatStatusDigi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "EventFilter/GEMRawToDigi/interface/GEMVfatStatusDigi.h"
#include "DataFormats/GEMDigi/interface/GEMVfatStatusDigi.h"
#include <iostream>

GEMVfatStatusDigi::GEMVfatStatusDigi(gem::VFATdata &vfat) {
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/GEMRawToDigi/src/VFATdata.cc → DataFormats/GEMDigi/src/VFATdata.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "EventFilter/GEMRawToDigi/interface/VFATdata.h"
#include "DataFormats/GEMDigi/interface/VFATdata.h"
#include <iostream>
using namespace gem;

Expand Down
12 changes: 12 additions & 0 deletions DataFormats/GEMDigi/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
33 changes: 33 additions & 0 deletions DataFormats/GEMDigi/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 1 addition & 0 deletions EventFilter/GEMRawToDigi/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 7 additions & 6 deletions EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 0 additions & 14 deletions EventFilter/GEMRawToDigi/src/classes.h
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions EventFilter/GEMRawToDigi/src/classes_def.xml
View file
Open in desktop

This file was deleted.