Merge pull request #36627 from seungjin-yang/Moving-GEM-Offline-DQM__…

…from-CMSSW_12_3_0_pre2

Move GEM offline DQM files from DQMOffline/Muon to DQM/GEM

DQM/GEM/BuildFile.xml

@@ -4,8 +4,12 @@
 <use name="FWCore/Utilities"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/GEMDigi"/>
+<use name="DataFormats/MuonReco"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/GEMGeometry"/>
+<use name="RecoMuon/TrackingTools"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="Validation/MuonHits"/>
 <use name="Validation/MuonGEMHits"/>
 <export>
   <lib name="1"/>

DQM/GEM/interface/GEMDQMBase.h

@@ -28,7 +28,7 @@
 
 class GEMDQMBase : public DQMEDAnalyzer {
 public:
-  // Borrwed from DQMOffline/Muon/interface/GEMOfflineDQMBase.h
+  // Borrwed from DQM/GEM/interface/GEMOfflineDQMBase.h
   class BookingHelper {
   public:
     BookingHelper(DQMStore::IBooker &ibooker, const TString &name_suffix, const TString &title_suffix)
@@ -568,7 +568,7 @@ class GEMDQMBase : public DQMEDAnalyzer {
   Int_t nNumEtaPartitionGE21_;
 };
 
-// Borrwed from DQMOffline/Muon/interface/GEMOfflineDQMBase.h
+// Borrwed from DQM/GEM/interface/GEMOfflineDQMBase.h
 template <typename T>
 inline bool GEMDQMBase::checkRefs(const std::vector<T *> &refs) {
   if (refs.empty())
@@ -578,7 +578,7 @@ inline bool GEMDQMBase::checkRefs(const std::vector<T *> &refs) {
   return true;
 }
 
-// The 'get...' functions in the below are borrwed from DQMOffline/Muon/interface/GEMOfflineDQMBase.h
+// The 'get...' functions in the below are borrwed from DQM/GEM/interface/GEMOfflineDQMBase.h
 inline int GEMDQMBase::getMaxVFAT(const int station) {
   if (station == 1)
     return GEMeMap::maxVFatGE11_;

DQMOffline/Muon/interface/GEMOfflineDQMBase.h → DQM/GEM/interface/GEMOfflineDQMBase.h

@@ -1,5 +1,5 @@
-#ifndef DQMOffline_Muon_GEMOfflineDQMBase_h
-#define DQMOffline_Muon_GEMOfflineDQMBase_h
+#ifndef DQM_GEM_GEMOfflineDQMBase_h
+#define DQM_GEM_GEMOfflineDQMBase_h
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
@@ -98,4 +98,4 @@ inline GEMDetId GEMOfflineDQMBase::getKey(const GEMDetId& id) {
   return GEMDetId{id.region(), 1, id.station(), id.layer(), id.chamber() % 2, id.roll()};
 }
 
-#endif  // DQMOffline_Muon_GEMOfflineDQMBase_h
+#endif  // DQM_GEM_GEMOfflineDQMBase_h

DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc → DQM/GEM/plugins/GEMEfficiencyAnalyzer.cc

@@ -1,4 +1,4 @@
-#include "DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h"
+#include "DQM/GEM/plugins/GEMEfficiencyAnalyzer.h"
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"

DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h → DQM/GEM/plugins/GEMEfficiencyAnalyzer.h

@@ -1,5 +1,5 @@
-#ifndef DQMOffline_Muon_GEMEfficiencyAnalyzer_h
-#define DQMOffline_Muon_GEMEfficiencyAnalyzer_h
+#ifndef DQM_GEM_GEMEfficiencyAnalyzer_h
+#define DQM_GEM_GEMEfficiencyAnalyzer_h
 
 /** \class GEMEfficiencyAnalyzer
  * 
@@ -9,7 +9,7 @@
  * \author Seungjin Yang <[email protected]>
  */
 
-#include "DQMOffline/Muon/interface/GEMOfflineDQMBase.h"
+#include "DQM/GEM/interface/GEMOfflineDQMBase.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
@@ -135,4 +135,4 @@ inline bool GEMEfficiencyAnalyzer::isInsideOut(const reco::Track &track) {
   return track.innerPosition().mag2() > track.outerPosition().mag2();
 }
 
-#endif  // DQMOffline_Muon_GEMEfficiencyAnalyzer_h
+#endif  // DQM_GEM_GEMEfficiencyAnalyzer_h

DQMOffline/Muon/src/GEMEfficiencyHarvester.cc → DQM/GEM/plugins/GEMEfficiencyHarvester.cc

@@ -1,4 +1,4 @@
-#include "DQMOffline/Muon/interface/GEMEfficiencyHarvester.h"
+#include "DQM/GEM/plugins/GEMEfficiencyHarvester.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/isFinite.h"

DQMOffline/Muon/interface/GEMEfficiencyHarvester.h → DQM/GEM/plugins/GEMEfficiencyHarvester.h

@@ -1,5 +1,5 @@
-#ifndef DQMOffline_Muon_GEMEfficiencyHarvester_h
-#define DQMOffline_Muon_GEMEfficiencyHarvester_h
+#ifndef DQM_GEM_GEMEfficiencyHarvester_h
+#define DQM_GEM_GEMEfficiencyHarvester_h
 
 /** \class GEMEfficiencyAnalyzer
  * 
@@ -46,4 +46,4 @@ int GEMEfficiencyHarvester::findResolutionBin(const T& elem, const std::vector<T
   return bin;
 }
 
-#endif  // DQMOffline_Muon_GEMEfficiencyHarvester_h
+#endif  // DQM_GEM_GEMEfficiencyHarvester_h

DQM/GEM/plugins/SealModule.cc

@@ -0,0 +1,8 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+#include "DQM/GEM/plugins/GEMEfficiencyAnalyzer.h"
+#include "DQM/GEM/plugins/GEMEfficiencyHarvester.h"
+
+DEFINE_FWK_MODULE(GEMEfficiencyAnalyzer);
+DEFINE_FWK_MODULE(GEMEfficiencyHarvester);

DQMOffline/Muon/python/gemEfficiencyAnalyzerCosmics_cfi.py → DQM/GEM/python/gemEfficiencyAnalyzerCosmics_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 from RecoMuon.TrackingTools.MuonServiceProxy_cff import MuonServiceProxy
-from DQMOffline.Muon.gemEfficiencyAnalyzerCosmicsDefault_cfi import gemEfficiencyAnalyzerCosmicsDefault as _gemEfficiencyAnalyzerCosmicsDefault
+from DQM.GEM.gemEfficiencyAnalyzerCosmicsDefault_cfi import gemEfficiencyAnalyzerCosmicsDefault as _gemEfficiencyAnalyzerCosmicsDefault
 from TrackingTools.TransientTrack.TransientTrackBuilder_cfi import *
 
 gemEfficiencyAnalyzerCosmics = _gemEfficiencyAnalyzerCosmicsDefault.clone(

DQMOffline/Muon/python/gemEfficiencyAnalyzer_cfi.py → DQM/GEM/python/gemEfficiencyAnalyzer_cfi.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 from RecoMuon.TrackingTools.MuonServiceProxy_cff import MuonServiceProxy
-from DQMOffline.Muon.gemEfficiencyAnalyzerDefault_cfi import gemEfficiencyAnalyzerDefault as _gemEfficiencyAnalyzerDefault
+from DQM.GEM.gemEfficiencyAnalyzerDefault_cfi import gemEfficiencyAnalyzerDefault as _gemEfficiencyAnalyzerDefault
 from TrackingTools.TransientTrack.TransientTrackBuilder_cfi import *
 
 gemOfflineDQMTightGlbMuons = cms.EDFilter("MuonSelector",

DQMOffline/Muon/python/gemEfficiencyHarvesterCosmics_cfi.py → DQM/GEM/python/gemEfficiencyHarvesterCosmics_cfi.py

@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
-from DQMOffline.Muon.gemEfficiencyHarvesterDefault_cfi import gemEfficiencyHarvesterDefault as _gemEfficiencyHarvesterDefault
-from DQMOffline.Muon.gemEfficiencyAnalyzerCosmics_cfi import gemEfficiencyAnalyzerCosmics as _gemEfficiencyAnalyzerCosmics
-from DQMOffline.Muon.gemEfficiencyAnalyzerCosmics_cfi import gemEfficiencyAnalyzerCosmicsOneLeg as _gemEfficiencyAnalyzerCosmicsOneLeg
+from DQM.GEM.gemEfficiencyHarvesterDefault_cfi import gemEfficiencyHarvesterDefault as _gemEfficiencyHarvesterDefault
+from DQM.GEM.gemEfficiencyAnalyzerCosmics_cfi import gemEfficiencyAnalyzerCosmics as _gemEfficiencyAnalyzerCosmics
+from DQM.GEM.gemEfficiencyAnalyzerCosmics_cfi import gemEfficiencyAnalyzerCosmicsOneLeg as _gemEfficiencyAnalyzerCosmicsOneLeg
 
 gemEfficiencyHarvesterCosmics = _gemEfficiencyHarvesterDefault.clone(
     folder = cms.untracked.string(_gemEfficiencyAnalyzerCosmics.folder.value()),

DQMOffline/Muon/python/gemEfficiencyHarvester_cfi.py → DQM/GEM/python/gemEfficiencyHarvester_cfi.py

@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
-from DQMOffline.Muon.gemEfficiencyHarvesterDefault_cfi import gemEfficiencyHarvesterDefault as _gemEfficiencyHarvesterDefault
-from DQMOffline.Muon.gemEfficiencyAnalyzer_cfi import gemEfficiencyAnalyzerTightGlb as _gemEfficiencyAnalyzerTightGlb
-from DQMOffline.Muon.gemEfficiencyAnalyzer_cfi import gemEfficiencyAnalyzerSta as _gemEfficiencyAnalyzerSta
+from DQM.GEM.gemEfficiencyHarvesterDefault_cfi import gemEfficiencyHarvesterDefault as _gemEfficiencyHarvesterDefault
+from DQM.GEM.gemEfficiencyAnalyzer_cfi import gemEfficiencyAnalyzerTightGlb as _gemEfficiencyAnalyzerTightGlb
+from DQM.GEM.gemEfficiencyAnalyzer_cfi import gemEfficiencyAnalyzerSta as _gemEfficiencyAnalyzerSta
 
 gemEfficiencyHarvesterTightGlb = _gemEfficiencyHarvesterDefault.clone(
     folder = cms.untracked.string(_gemEfficiencyAnalyzerTightGlb.folder.value())

DQMOffline/Muon/python/gem_dqm_offline_client_cff.py → DQM/GEM/python/gem_dqm_offline_client_cff.py

@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQM.GEM.GEMDQMHarvester_cfi import *
-from DQMOffline.Muon.gemEfficiencyHarvester_cfi import *
+from DQM.GEM.gemEfficiencyHarvester_cfi import *
 
 gemClients = cms.Sequence(
     GEMDQMHarvester *
     gemEfficiencyHarvesterTightGlb *
     gemEfficiencyHarvesterSta
-    )
+)

DQMOffline/Muon/python/gem_dqm_offline_client_cosmics_cff.py → DQM/GEM/python/gem_dqm_offline_client_cosmics_cff.py

@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQM.GEM.GEMDQMHarvester_cfi import *
-from DQMOffline.Muon.gemEfficiencyHarvesterCosmics_cfi import *
+from DQM.GEM.gemEfficiencyHarvesterCosmics_cfi import *
 
 gemClientsCosmics = cms.Sequence(
     GEMDQMHarvester *
     gemEfficiencyHarvesterCosmics *
     gemEfficiencyHarvesterCosmicsOneLeg
-    )
+)

DQMOffline/Muon/python/gem_dqm_offline_source_cff.py → DQM/GEM/python/gem_dqm_offline_source_cff.py

@@ -2,8 +2,7 @@
 
 from DQM.GEM.GEMDigiSource_cfi import *
 from DQM.GEM.GEMRecHitSource_cfi import *
-
-from DQMOffline.Muon.gemEfficiencyAnalyzer_cfi import *
+from DQM.GEM.gemEfficiencyAnalyzer_cfi import *
 
 GEMDigiSource.modeRelVal = True
 GEMRecHitSource.modeRelVal = True

DQMOffline/Muon/python/gem_dqm_offline_source_cosmics_cff.py → DQM/GEM/python/gem_dqm_offline_source_cosmics_cff.py

@@ -2,8 +2,7 @@
 
 from DQM.GEM.GEMDigiSource_cfi import *
 from DQM.GEM.GEMRecHitSource_cfi import *
-
-from DQMOffline.Muon.gemEfficiencyAnalyzerCosmics_cfi import *
+from DQM.GEM.gemEfficiencyAnalyzerCosmics_cfi import *
 
 GEMDigiSource.modeRelVal = True
 GEMRecHitSource.modeRelVal = True
@@ -13,4 +12,4 @@
     GEMRecHitSource *
     gemEfficiencyAnalyzerCosmics *
     gemEfficiencyAnalyzerCosmicsOneLeg
-    )
+)

DQM/GEM/src/GEMDQMBase.cc

@@ -26,7 +26,7 @@ int GEMDQMBase::initGeometry(edm::EventSetup const& iSetup) {
   return 0;
 }
 
-// Borrowed from DQMOffline/Muon/src/GEMOfflineDQMBase.cc
+// Borrowed from DQM/GEM/src/GEMOfflineDQMBase.cc
 int GEMDQMBase::getNumEtaPartitions(const GEMStation* station) {
   const auto&& superchambers = station->superChambers();
   if (not checkRefs(superchambers)) {
@@ -64,7 +64,7 @@ int GEMDQMBase::loadChambers() {
     }
   }
 
-  // Borrwed from DQMOffline/Muon/src/GEMOfflineMonitor.cc
+  // Borrwed from DQM/GEM/src/GEMOfflineMonitor.cc
   nMaxNumCh_ = 0;
   for (const GEMRegion* region : GEMGeometry_->regions()) {
     const int region_number = region->region();

DQMOffline/Muon/src/GEMOfflineDQMBase.cc → DQM/GEM/src/GEMOfflineDQMBase.cc

@@ -1,4 +1,4 @@
-#include "DQMOffline/Muon/interface/GEMOfflineDQMBase.h"
+#include "DQM/GEM/interface/GEMOfflineDQMBase.h"
 #include "FWCore/Utilities/interface/Likely.h"
 
 GEMOfflineDQMBase::GEMOfflineDQMBase(const edm::ParameterSet& pset) {}

DQMOffline/Configuration/python/DQMOfflineCosmics_SecondStep_cff.py

@@ -11,7 +11,7 @@
 from DQM.DTMonitorClient.dtDQMOfflineClients_Cosmics_cff import *
 from DQM.RPCMonitorClient.RPCTier0Client_cff import *
 from DQM.CSCMonitorModule.csc_dqm_offlineclient_cosmics_cff import *
-from DQMOffline.Muon.gem_dqm_offline_client_cosmics_cff import *
+from DQM.GEM.gem_dqm_offline_client_cosmics_cff import *
 from DQMServices.Components.DQMFEDIntegrityClient_cff import *
 
 DQMNone = cms.Sequence()
@@ -36,7 +36,7 @@
 
 DQMOfflineCosmics_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )
 
-DQMOfflineCosmics_SecondStep_PreDPG = cms.Sequence( 
+DQMOfflineCosmics_SecondStep_PreDPG = cms.Sequence(
                                                     DQMOfflineCosmics_SecondStepEcal *
                                                     DQMOfflineCosmics_SecondStepHcal *
                                                     DQMOfflineCosmics_SecondStepTrackerStrip *
@@ -73,7 +73,7 @@
                                                     DQMOfflineCosmics_SecondStepMUO *
                                                     DQMOfflineCosmics_SecondStepEGamma *
                                                     DQMOfflineCosmics_SecondStepL1T *
-                                                    DQMOfflineCosmics_SecondStepJetMET 
+                                                    DQMOfflineCosmics_SecondStepJetMET
                                                     )
 
 DQMOfflineCosmics_SecondStep_PrePOG.remove(fsqClient)
@@ -82,12 +82,12 @@
                                                 DQMMessageLoggerClientSeq *
                                                 dqmFastTimerServiceClient)
 
-DQMOfflineCosmics_SecondStep = cms.Sequence( 
+DQMOfflineCosmics_SecondStep = cms.Sequence(
                                              DQMOfflineCosmics_SecondStep_PreDPG *
                                              DQMOfflineCosmics_SecondStep_PrePOG *
 					     DQMOfflineCosmics_SecondStepTrigger *
                                              DQMMessageLoggerClientSeq )
 
-DQMOfflineCosmics_SecondStep_FakeHLT = cms.Sequence(DQMOfflineCosmics_SecondStep ) 
+DQMOfflineCosmics_SecondStep_FakeHLT = cms.Sequence(DQMOfflineCosmics_SecondStep )
 DQMOfflineCosmics_SecondStep_FakeHLT.remove( DQMOfflineCosmics_SecondStepTrigger )
 

DQMOffline/Configuration/python/DQMOfflineCosmics_cff.py

@@ -11,7 +11,7 @@
 from DQM.DTMonitorModule.dtDQMOfflineSources_Cosmics_cff import *
 from DQM.RPCMonitorClient.RPCTier0Source_cff import *
 from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
-from DQMOffline.Muon.gem_dqm_offline_source_cosmics_cff import *
+from DQM.GEM.gem_dqm_offline_source_cosmics_cff import *
 from DQM.EcalPreshowerMonitorModule.es_dqm_source_offline_cosmic_cff import *
 from DQM.CastorMonitor.castor_dqm_sourceclient_offline_cff import *
 
@@ -46,9 +46,9 @@
                                         DQMOfflineCosmicsEcal *
                                         DQMOfflineCosmicsHcal *
                                         DQMOfflineCosmicsTrackerStrip *
-                                        DQMOfflineCosmicsTrackerPixel * 
+                                        DQMOfflineCosmicsTrackerPixel *
 					DQMOfflineCosmicsMuonDPG *
-                                        DQMOfflineCosmicsCASTOR 
+                                        DQMOfflineCosmicsCASTOR
 					)
 
 DQMOfflineCosmicsDPG = cms.Sequence( DQMOfflineCosmicsPreDPG *
@@ -77,11 +77,11 @@
 
 DQMOfflineCosmicsPrePOG = cms.Sequence( DQMOfflineCosmicsTracking *
                                         DQMOfflineCosmicsMUO *
-# Following modules removed since they produce empty histograms 
+# Following modules removed since they produce empty histograms
 # and are not used in DC
 #                                        DQMOfflineCosmicsJetMET *
 #                                        DQMOfflineCosmicsEGamma *
-                                        DQMOfflineCosmicsTrigger 
+                                        DQMOfflineCosmicsTrigger
 #					DQMOfflineCosmicsPhysics
                                         )
 

DQMOffline/Configuration/python/DQMOfflineHeavyIons_SecondStep_cff.py

@@ -11,7 +11,7 @@
 from DQM.DTMonitorClient.dtDQMOfflineClients_cff import *
 from DQM.RPCMonitorClient.RPCTier0Client_cff import *
 from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
-from DQMOffline.Muon.gem_dqm_offline_client_cff import *
+from DQM.GEM.gem_dqm_offline_client_cff import *
 from DQMServices.Components.DQMFEDIntegrityClient_cff import *
 
 DQMNone = cms.Sequence()
@@ -36,13 +36,13 @@
 
 DQMOfflineHeavyIons_SecondStepFED = cms.Sequence( dqmFEDIntegrityClient )
 
-DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence( 
+DQMOfflineHeavyIons_SecondStep_PreDPG = cms.Sequence(
 						      DQMOfflineHeavyIons_SecondStepEcal *
                                                       DQMOfflineHeavyIons_SecondStepTrackerStrip *
                                                       DQMOfflineHeavyIons_SecondStepTrackerPixel *
                                                       DQMOfflineHeavyIons_SecondStepHcal *
                                                       DQMOfflineHeavyIons_SecondStepMuonDPG *
-                                                      DQMOfflineHeavyIons_SecondStepFED 
+                                                      DQMOfflineHeavyIons_SecondStepFED
 							)
 
 DQMOfflineHeavyIons_SecondStepDPG = cms.Sequence(
@@ -67,7 +67,7 @@
 
 DQMOfflineHeavyIons_SecondStepTracking = cms.Sequence( hiTrackingDqmClientHeavyIons )
 
-DQMOfflineHeavyIons_SecondStep_PrePOG = cms.Sequence( DQMOfflineHeavyIons_SecondStepMUO * 
+DQMOfflineHeavyIons_SecondStep_PrePOG = cms.Sequence( DQMOfflineHeavyIons_SecondStepMUO *
                                                       DQMOfflineHeavyIons_SecondStepEGamma *
                                                       DQMOfflineHeavyIons_SecondStepTrigger *
                                                       DQMOfflineHeavyIons_SecondStepBeam *

DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py

@@ -13,7 +13,7 @@
 from DQM.DTMonitorModule.dtDQMOfflineSources_HI_cff import *
 from DQM.RPCMonitorClient.RPCTier0Source_cff import *
 from DQM.CSCMonitorModule.csc_dqm_sourceclient_offline_cff import *
-from DQMOffline.Muon.gem_dqm_offline_source_cff import *
+from DQM.GEM.gem_dqm_offline_source_cff import *
 from DQM.BeamMonitor.AlcaBeamMonitorHeavyIons_cff import *
 
 DQMNone = cms.Sequence()
@@ -56,12 +56,12 @@
 
 #Modifications
 from DQMOffline.Muon.muonMonitors_cff import *
-diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin   
-diMuonHistos.etaBBin = cms.int32(70)    
-diMuonHistos.etaEBin = cms.int32(70)    
-diMuonHistos.LowMassMin = cms.double(2.0)   
-diMuonHistos.LowMassMax = cms.double(14.0)    
-diMuonHistos.HighMassMin = cms.double(55.0)   
+diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin
+diMuonHistos.etaBBin = cms.int32(70)
+diMuonHistos.etaEBin = cms.int32(70)
+diMuonHistos.LowMassMin = cms.double(2.0)
+diMuonHistos.LowMassMax = cms.double(14.0)
+diMuonHistos.HighMassMin = cms.double(55.0)
 diMuonHistos.HighMassMax = cms.double(125.0)
 
 from DQMOffline.Trigger.DQMOffline_Trigger_cff import *
@@ -138,7 +138,7 @@
 DQMOfflineHeavyIonsPrePOG = cms.Sequence( DQMOfflineHeavyIonsMUO *
                                            DQMOfflineHeavyIonsTracking *
                                            DQMOfflineHeavyIonsJetMET *
-                                           DQMOfflineHeavyIonsEGamma * 
+                                           DQMOfflineHeavyIonsEGamma *
                                            DQMOfflineHeavyIonsTrigger *
                                            DQMOfflineHeavyIonsVertex *
                                            DQMOfflineHeavyIonsBeam *

DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py

@@ -10,7 +10,7 @@
 from DQM.DTMonitorClient.dtDQMOfflineClients_cff import *
 from DQM.RPCMonitorClient.RPCTier0Client_cff import *
 from DQM.CSCMonitorModule.csc_dqm_offlineclient_collisions_cff import *
-from DQMOffline.Muon.gem_dqm_offline_client_cff import *
+from DQM.GEM.gem_dqm_offline_client_cff import *
 from DQMOffline.Hcal.HcalDQMOfflinePostProcessor_cff import *
 from DQM.HcalTasks.OfflineHarvestingSequence_pp import *
 from DQMServices.Components.DQMFEDIntegrityClient_cff import *
@@ -46,7 +46,7 @@
 
 DQMOffline_SecondStepL1TPhase2 = cms.Sequence( Phase2l1TriggerDqmOfflineClient )
 
-DQMOffline_SecondStep_PreDPG = cms.Sequence( 
+DQMOffline_SecondStep_PreDPG = cms.Sequence(
                                              DQMOffline_SecondStepEcal *
                                              DQMOffline_SecondStepTrackerStrip *
 					     DQMOffline_SecondStepTrackerPixel *