Skip to content

Commit

Permalink
Merge pull request #3297 from dildick/GEM-DIGI-Cleanup
Browse files Browse the repository at this point in the history 
Gem digi cleanup
  • Loading branch information
@cmsbuild
cmsbuild committed Apr 16, 2014
2 parents 7089357 + 9456567 commit aea693b
Show file tree
Hide file tree
Showing 14 changed files with 57 additions and 147 deletions.
4 changes: 1 addition & 3 deletions DataFormats/GEMDigi/interface/GEMCSCPadDigi.h
View file
Expand Up @@ -5,9 +5,6 @@
*
* Digi for GEM-CSC trigger pads
*
* $Date: 2013/01/18 04:21:50 $
* $Revision: 1.1 $
*
* \author Vadim Khotilovich
*
*/
Expand All @@ -22,6 +19,7 @@ class GEMCSCPadDigi{
GEMCSCPadDigi ();

bool operator==(const GEMCSCPadDigi& digi) const;
bool operator!=(const GEMCSCPadDigi& digi) const;
bool operator<(const GEMCSCPadDigi& digi) const;

int pad() const { return pad_; }
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/GEMDigi/interface/GEMCSCPadDigiCollection.h
View file
Expand Up @@ -3,8 +3,6 @@
/** \class GEMCSCPadDigiCollection
*
* \author Vadim Khotilovich
* \version $Id: GEMCSCPadDigiCollection.h,v 1.1 2013/01/18 04:21:50 khotilov Exp $
* \date 21 Apr 2005
*/

#include <DataFormats/MuonDetId/interface/GEMDetId.h>
Expand Down
4 changes: 1 addition & 3 deletions DataFormats/GEMDigi/interface/GEMDigi.h
View file
Expand Up @@ -5,9 +5,6 @@
*
* Digi for GEM
*
* $Date: 2013/01/18 04:18:31 $
* $Revision: 1.2 $
*
* \author Vadim Khotilovich
*
*/
Expand All @@ -22,6 +19,7 @@ class GEMDigi{
GEMDigi ();

bool operator==(const GEMDigi& digi) const;
bool operator!=(const GEMDigi& digi) const;
bool operator<(const GEMDigi& digi) const;

int strip() const { return strip_; }
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/GEMDigi/interface/GEMDigiCollection.h
View file
Expand Up @@ -3,8 +3,6 @@
/** \class GEMDigiCollection
*
* \author Vadim Khotilovich
* \version $Id: GEMDigiCollection.h,v 1.1 2012/12/08 01:45:22 khotilov Exp $
* \date 21 Apr 2005
*/

#include <DataFormats/MuonDetId/interface/GEMDetId.h>
Expand Down
4 changes: 1 addition & 3 deletions DataFormats/GEMDigi/interface/ME0DigiPreReco.h
View file
Expand Up @@ -5,9 +5,6 @@
*
* Digi for ME0
*
* $Date: 2014/02/02 21:53:31 $
* $Revision: 1.0 $
*
* \author Marcello Maggi
*
*/
Expand All @@ -22,6 +19,7 @@ class ME0DigiPreReco{
ME0DigiPreReco ();

bool operator==(const ME0DigiPreReco& digi) const;
bool operator!=(const ME0DigiPreReco& digi) const;
bool operator<(const ME0DigiPreReco& digi) const;

float x() const { return x_; }
Expand Down
2 changes: 0 additions & 2 deletions DataFormats/GEMDigi/interface/ME0DigiPreRecoCollection.h
View file
Expand Up @@ -3,8 +3,6 @@
/** \class ME0DigiPreRecoCollection
*
* \author Marcello Maggi
* \version $Id: ME0DigiPreRecoCollection.h,v 1.0 2014/02/02 10:09:22 mmaggi Exp $
* \date 2 February 2014
*/

#include <DataFormats/MuonDetId/interface/ME0DetId.h>
Expand Down
11 changes: 8 additions & 3 deletions DataFormats/GEMDigi/src/GEMCSCPadDigi.cc
View file
Expand Up @@ -24,9 +24,14 @@ GEMCSCPadDigi::GEMCSCPadDigi ():
// Comparison
bool GEMCSCPadDigi::operator == (const GEMCSCPadDigi& digi) const
{
if ( pad_ != digi.pad() ||
bx_ != digi.bx() ) return false;
return true;
return pad_ == digi.pad() and bx_ == digi.bx();
}


// Comparison
bool GEMCSCPadDigi::operator != (const GEMCSCPadDigi& digi) const
{
return pad_ != digi.pad() or bx_ != digi.bx();
}


Expand Down
11 changes: 8 additions & 3 deletions DataFormats/GEMDigi/src/GEMDigi.cc
View file
Expand Up @@ -24,9 +24,14 @@ GEMDigi::GEMDigi ():
// Comparison
bool GEMDigi::operator == (const GEMDigi& digi) const
{
if ( strip_ != digi.strip() ||
bx_ != digi.bx() ) return false;
return true;
return strip_ == digi.strip() and bx_ == digi.bx();
}


// Comparison
bool GEMDigi::operator != (const GEMDigi& digi) const
{
return strip_ != digi.strip() or bx_ != digi.bx();
}


Expand Down
13 changes: 8 additions & 5 deletions DataFormats/GEMDigi/src/ME0DigiPreReco.cc
View file
Expand Up @@ -32,11 +32,14 @@ ME0DigiPreReco::ME0DigiPreReco ():
// Comparison
bool ME0DigiPreReco::operator == (const ME0DigiPreReco& digi) const
{
if ( x_ != digi.x() ||
y_ != digi.y() ||
tof_ != digi.tof()
) return false;
return true;
return x_ == digi.x() and y_ == digi.y() and tof_ == digi.tof();
}


// Comparison
bool ME0DigiPreReco::operator != (const ME0DigiPreReco& digi) const
{
return x_ != digi.x() or y_ != digi.y() or tof_ != digi.tof();
}


Expand Down
19 changes: 7 additions & 12 deletions SimMuon/GEMDigitizer/python/customizeGEMDigi.py
View file
Expand Up @@ -90,10 +90,10 @@ def customize_random_GEMDigi(process):

## load the digitizer and pad producer
def load_GEM_digitizers(process):
process.load('SimMuon.GEMDigitizer.muonGEMDigis_cfi')
process.load('SimMuon.GEMDigitizer.muonGEMCSCPadDigis_cfi')
process.load('SimMuon.GEMDigitizer.muonGEMDigi_cff')
return process


# customize the full digitization sequence pdigi by adding GEMs
def customize_digi_addGEM(process):
process = load_GEM_digitizers(process)
Expand All @@ -116,7 +116,7 @@ def customize_digi_addGEM(process):
process.doAllDigi*
process.addPileupInfo
)
append_GEMDigi_event(process)
process = append_GEMDigi_event(process)
return process


Expand All @@ -137,7 +137,7 @@ def customize_digi_addGEM_muon_only(process):
cms.SequencePlaceholder("mix")*
process.muonDigi
)
append_GEMDigi_event(process)
process = append_GEMDigi_event(process)
return process


Expand All @@ -146,21 +146,15 @@ def customize_digi_addGEM_gem_only(process):
process = load_GEM_digitizers(process)
process = customize_random_GEMDigi(process)
process = customize_mix_addGEM_muon_only(process)
process.muonDigi = cms.Sequence(
process.simMuonCSCDigis +
process.simMuonDTDigis +
process.simMuonRPCDigis +
process.simMuonGEMDigis +
process.simMuonGEMCSCPadDigis
)
process.pdigi = cms.Sequence(
cms.SequencePlaceholder("randomEngineStateProducer")*
cms.SequencePlaceholder("mix")*
process.simMuonGEMDigis*
process.simMuonGEMCSCPadDigis
)
append_GEMDigi_event(process)
process = append_GEMDigi_event(process)
return process


# insert the GEMDigi and GEMCSCPadDigi collection to the event
def append_GEMDigi_event(process):
Expand All @@ -170,3 +164,4 @@ def append_GEMDigi_event(process):
if hasattr(process,b):
getattr(process,b).outputCommands.append('keep *_simMuonGEMDigis_*_*')
getattr(process,b).outputCommands.append('keep *_simMuonGEMCSCPadDigis_*_*')
return process
27 changes: 21 additions & 6 deletions SimMuon/GEMDigitizer/python/customizeME0Digi.py
View file
Expand Up @@ -88,8 +88,15 @@ def customize_random_ME0Digi(process):
return process


## load the digitizer
def load_ME0_digitizer(process):
process.load('SimMuon.GEMDigitizer.muonME0DigisPreReco_cfi')
return process


# customize the full digitization sequence pdigi by adding ME0s
def customize_digi_addME0(process):
process = load_ME0_digitizer(process)
process = customize_random_ME0Digi(process)
process = customize_mix_addME0(process)
process.muonDigi = cms.Sequence(
Expand All @@ -109,11 +116,13 @@ def customize_digi_addME0(process):
process.trackingParticles*
process.addPileupInfo
)
process = append_ME0Digi_event(process)
return process


# customize the digitization sequence pdigi to only digitize DT+CSC+RPC+ME0
def customize_digi_addME0_muon_only(process):
process = load_ME0_digitizer(process)
process = customize_random_ME0Digi(process)
process = customize_mix_addME0_muon_only(process)
process.muonDigi = cms.Sequence(
Expand All @@ -127,23 +136,29 @@ def customize_digi_addME0_muon_only(process):
cms.SequencePlaceholder("mix")*
process.muonDigi
)
process = append_ME0Digi_event(process)
return process


# customize the digitization sequence pdigi to only digitize ME0
def customize_digi_addME0_me0_only(process):
process = load_ME0_digitizer(process)
process = customize_random_ME0Digi(process)
process = customize_mix_addME0_muon_only(process)
process.muonDigi = cms.Sequence(
process.simMuonCSCDigis +
process.simMuonDTDigis +
process.simMuonRPCDigis +
process.simMuonME0Digis
)
process.pdigi = cms.Sequence(
cms.SequencePlaceholder("randomEngineStateProducer")*
cms.SequencePlaceholder("mix")*
process.simMuonME0Digis
)
process = append_ME0Digi_event(process)
return process


# insert the ME0Digi collection to the event
def append_ME0Digi_event(process):
alist=['AODSIM','RECOSIM','FEVTSIM','FEVTDEBUG','FEVTDEBUGHLT','RECODEBUG','RAWRECOSIMHLT','RAWRECODEBUGHLT']
for a in alist:
b=a+'output'
if hasattr(process,b):
getattr(process,b).outputCommands.append('keep *_simMuonME0Digis_*_*')
return process
2 changes: 1 addition & 1 deletion SimMuon/GEMDigitizer/test/GEMCSCPadDigiReader.cc
View file
Expand Up @@ -2,9 +2,9 @@
#define SimMuon_GEMCSCPadDigiReader_h

/** \class GEMDigiReader
*
* Dumps GEM-CSC trigger pad digis
*
* $Id: GEMCSCPadDigiReader.cc,v 1.4 2013/01/30 12:12:45 khotilov Exp $
* \authors: Vadim Khotilovich
*/

Expand Down
2 changes: 1 addition & 1 deletion SimMuon/GEMDigitizer/test/GEMDigiReader.cc
View file
Expand Up @@ -2,9 +2,9 @@
#define SimMuon_GEMDigiReader_h

/** \class GEMDigiReader
*
* Dumps GEM digis
*
* $Id: GEMDigiReader.cc,v 1.1 2012/12/08 01:31:36 khotilov Exp $
* \authors: Vadim Khotilovich
*/

Expand Down
101 changes: 0 additions & 101 deletions SimMuon/GEMDigitizer/test/runMuonDigiProd_cfg.py
View file

This file was deleted.

0 comments on commit aea693b

Please sign in to comment.