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

Jump to bottom

Combined tools for muon system aging/masking for upgrade studies (91X) #18571

Merged
merged 22 commits into from
May 8, 2017
Merged

Combined tools for muon system aging/masking for upgrade studies (91X) #18571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
12f6eb9
cleaned setup
sunilUIET Mar 17, 2017
92742ba
Merged muonSysAging91X_v2 from repository sunilUIET
aminnj Mar 19, 2017
e5940bd
add CSC filtering
aminnj Mar 19, 2017
36b7f40
Merge pull request #2 from aminnj/csc-aging-integration_90X_v1
sunilUIET Mar 19, 2017
13becad
Merged muonSysAging91X_v2 from repository sunilUIET
sunilUIET Mar 19, 2017
677e912
fixes for GEM masking and ME0 masking included
sunilUIET Mar 21, 2017
be3966a
Merged muonSysAging91X_v2 from repository sunilUIET
sunilUIET Mar 25, 2017
655ef2d
fix for ME0
sunilUIET Mar 25, 2017
d1fa703
Merged muonSysAging91X_v2 from repository sunilUIET
Mar 27, 2017
64ce9f6
Removed MuonSysAging duplicate
Mar 27, 2017
0cbe770
Cleanup before any integration
Mar 28, 2017
2654ace
Merging of DT, RPC, CSC, GEM, ME0 aging and masking tools
Mar 28, 2017
f5fd92a
move to edm::stream::EDProducer, reduce code duplication, cleanup
Apr 7, 2017
78dd79e
Fix era customization
Apr 7, 2017
f45083f
fix includes
Apr 7, 2017
876962a
remove function used for testing
Apr 12, 2017
7b5951b
new organization of cond format and producer code in different packages
Apr 13, 2017
8baf0a2
buildfile cleanup, cff print to stderr, update variable names, use mo…
Apr 20, 2017
3f8de8c
Moving EDProducers for aging to SimMuon/XY(Z)Digis, using fillDescrip…
Apr 24, 2017
1681c6f
GEM EDProducer bugfix
Apr 25, 2017
2ad4c71
Fix dictionary warning
Apr 26, 2017
ad5024a
Use const references in digi loops, update customization function
May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CondCore/RecoMuonPlugins/src/plugins.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ REGISTER_PLUGIN(MuScleFitDBobjectRcd,MuScleFitDBobject);
#include "CondFormats/DataRecord/interface/DYTThrObjectRcd.h"
REGISTER_PLUGIN(DYTThrObjectRcd,DYTThrObject);

#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
#include "CondFormats/DataRecord/interface/MuonSystemAgingRcd.h"
REGISTER_PLUGIN(MuonSystemAgingRcd,MuonSystemAging);
22 changes: 22 additions & 0 deletions CondFormats/DataRecord/interface/MuonSystemAgingRcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef MuonSystemAgingRcd_MuonSystemAgingRcd_h
#define MuonSystemAgingRcd_MuonSystemAgingRcd_h
// -*- C++ -*-
//
// Package: CondFormats/DataRecord
// Class : MuonSystemAgingRcd
//
/**\class MuonSystemAgingRcd MuonSystemAgingRcd.h CondFormats/DataRecord/interface/MuonSystemAgingRcd.h

Description: CondFormat implementing inefficiencies in muon stations to mimic aging effects

*/
//
// Author: Sunil Bansal
// Created: Wed, 01 Jun 2016 13:03:56 GMT
//

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"

class MuonSystemAgingRcd : public edm::eventsetup::EventSetupRecordImplementation<MuonSystemAgingRcd> {};

#endif
12 changes: 12 additions & 0 deletions CondFormats/DataRecord/src/MuonSystemAgingRcd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// -*- C++ -*-
//
// Package: CondFormats/DataRecord
// Class : MuonSystemAgingRcd
//
// Author: Sunil Bansal
// Created: Wed, 01 Jun 2016 13:03:56 GMT

#include "CondFormats/DataRecord/interface/MuonSystemAgingRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"

EVENTSETUP_RECORD_REG(MuonSystemAgingRcd);
37 changes: 37 additions & 0 deletions CondFormats/RecoMuonObjects/interface/MuonSystemAging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#ifndef MuonSystemAging_H
#define MuonSystemAging_H

#include "CondFormats/Serialization/interface/Serializable.h"
#include<cmath>
#include<iostream>
#include <vector>
#include <regex>
#include <map>

enum CSCInefficiencyType
{
EFF_CHAMBER=0,
EFF_STRIPS=1,
EFF_WIRES=2
};

class MuonSystemAging
{

public:

MuonSystemAging() { };
~MuonSystemAging() { };

std::map<unsigned int, float> m_RPCChambEffs;
std::map<unsigned int, float> m_DTChambEffs;
std::map<unsigned int, std::pair<unsigned int, float> > m_CSCChambEffs;

std::map<unsigned int, float> m_GEMChambEffs;
std::map<unsigned int, float> m_ME0ChambEffs;

COND_SERIALIZABLE;

};

#endif
3 changes: 3 additions & 0 deletions CondFormats/RecoMuonObjects/src/T_EventSetup_MuonSystemAging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
#include "FWCore/Utilities/interface/typelookup.h"
TYPELOOKUP_DATA_REG(MuonSystemAging);
2 changes: 2 additions & 0 deletions CondFormats/RecoMuonObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@
<class name="DYTParamsObject" class_version="2"/>
<class name="DYTParamObject"/>
<class name="std::vector<DYTParamObject>"/>
<class name="MuonSystemAging" class_version="0"/>
<class name="std::map<unsigned int, std::pair<unsigned int, float> >"/>
</lcgdict>
1 change: 1 addition & 0 deletions CondFormats/RecoMuonObjects/src/headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "CondFormats/RecoMuonObjects/interface/MuScleFitDBobject.h"
#include "CondFormats/RecoMuonObjects/interface/DYTThrObject.h"
#include "CondFormats/RecoMuonObjects/interface/DYTParamsObject.h"
#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"

#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
#include "CondFormats/External/interface/DetID.h"
Expand Down
12 changes: 9 additions & 3 deletions CondFormats/RecoMuonObjects/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<bin file="testSerializationRecoMuonObjects.cpp">
<use name="CondFormats/RecoMuonObjects"/>
</bin>
<library file="*.cc" name="CondFormatsRecoMuonObjectsTest">
<use name="CondFormats/RecoMuonObjects"/>
<use name="CondCore/DBOutputService"/>
<use name="FWCore/MessageLogger"/>
<use name="Geometry/DTGeometry"/>
<use name="Geometry/CSCGeometry"/>
<use name="Geometry/Records"/>
<flags EDM_PLUGIN="1"/>
</library>