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

Fixes for building in 71X #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes for building in 71X #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb4b107
fixes to build in 71X
Apr 8, 2014
2f5da9f
python cfi for Stage1Layer2 tests
Apr 8, 2014
fb21721
renaming to match L1 emulator
May 30, 2014
7c87788
add gitignore
May 30, 2014
ac52aaf
more name changes
Jun 12, 2014
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.pyc
__init__.py
61 changes: 61 additions & 0 deletions python/l1NtupleProducer_Stage1Layer2_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import FWCore.ParameterSet.Config as cms

l1NtupleProducer = cms.EDAnalyzer("L1NtupleProducer",
verbose = cms.untracked.bool(False),
physVal = cms.bool(True),

generatorSource = cms.InputTag("none"),
simulationSource = cms.InputTag("none"),
hltSource = cms.InputTag("none"),
gmtSource = cms.InputTag("none"),
gtEvmSource = cms.InputTag("none"),
gtSource = cms.InputTag("simGtDigis"),
#gtSource = cms.InputTag("none"),
gctCentralJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets"),
gctNonIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm"),
gctForwardJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets"),
gctIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm"),
gctEnergySumsSource = cms.InputTag("caloStage1LegacyFormatDigis",""),
gctTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets"),
rctSource = cms.InputTag("caloStage1LegacyFormatDigis"),
dttfSource = cms.InputTag("none"),
ecalSource = cms.InputTag("none"),
hcalSource = cms.InputTag("none"),
csctfTrkSource = cms.InputTag("none"),
csctfLCTSource = cms.InputTag("none"),
csctfStatusSource = cms.InputTag("none"),
csctfDTStubsSource = cms.InputTag("none"),
# if initCSCTFPtLutsPSet is True, then the CSCTF ptLUTs
# get initialized from the PSet, csctfPtLutsPSet
# useful for experts to overwrite the csctf pt LUTs
initCSCTFPtLutsPSet = cms.bool(False),
csctfPtLutsPSet = cms.PSet(LowQualityFlag = cms.untracked.uint32(4),
ReadPtLUT = cms.bool(False),
isBinary = cms.bool(False),
PtMethod = cms.untracked.uint32(32)
),

maxRPC = cms.uint32(12),
maxDTBX = cms.uint32(12),
maxCSC = cms.uint32(12),
maxGMT = cms.uint32(12),
maxGT = cms.uint32(12),
maxRCTREG = cms.uint32(400),
maxDTPH = cms.uint32(50),
maxDTTH = cms.uint32(50),
maxDTTR = cms.uint32(50),
maxGEN = cms.uint32(20),
maxCSCTFTR = cms.uint32(50),
maxCSCTFLCTSTR = cms.uint32(4),
maxCSCTFLCTS = cms.uint32(360),
maxCSCTFSPS = cms.uint32(12),

puMCFile = cms.untracked.string(""),
puDataFile = cms.untracked.string(""),
puMCHist = cms.untracked.string(""),
puDataHist = cms.untracked.string(""),

useAvgVtx = cms.untracked.bool(True),
maxAllowedWeight = cms.untracked.double(-1)
)

7 changes: 4 additions & 3 deletions src/L1AnalysisDTTF.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "L1TriggerDPG/L1Ntuples/interface/L1AnalysisDTTF.h"
#include "math.h"


L1Analysis::L1AnalysisDTTF::L1AnalysisDTTF()
Expand All @@ -14,7 +15,7 @@ L1Analysis::L1AnalysisDTTF::~L1AnalysisDTTF()
void L1Analysis::L1AnalysisDTTF::SetDTPH(const edm::Handle<L1MuDTChambPhContainer > L1MuDTChambPhContainer, unsigned int maxDTPH)
{

L1MuDTChambPhContainer::Phi_Container *PhContainer = L1MuDTChambPhContainer->getContainer();
const L1MuDTChambPhContainer::Phi_Container *PhContainer = L1MuDTChambPhContainer->getContainer();

dttf_.phSize = PhContainer->size();
int iphtr=0;
Expand Down Expand Up @@ -49,7 +50,7 @@ void L1Analysis::L1AnalysisDTTF::SetDTPH(const edm::Handle<L1MuDTChambPhContaine
void L1Analysis::L1AnalysisDTTF::SetDTTH(const edm::Handle<L1MuDTChambThContainer > L1MuDTChambThContainer, unsigned int maxDTTH)
{

L1MuDTChambThContainer::The_Container* ThContainer = L1MuDTChambThContainer->getContainer();
const L1MuDTChambThContainer::The_Container* ThContainer = L1MuDTChambThContainer->getContainer();

int ithtr=0;
dttf_.thSize = ThContainer->size();
Expand Down Expand Up @@ -88,7 +89,7 @@ void L1Analysis::L1AnalysisDTTF::SetDTTH(const edm::Handle<L1MuDTChambThContaine
void L1Analysis::L1AnalysisDTTF::SetDTTR(const edm::Handle<L1MuDTTrackContainer > L1MuDTTrackContainer, unsigned int maxDTTR)
{
double pig=acos(-1);
L1MuDTTrackContainer::TrackContainer *tr = L1MuDTTrackContainer->getContainer();
const L1MuDTTrackContainer::TrackContainer *tr = L1MuDTTrackContainer->getContainer();
int idttr = 0 ;
dttf_.trSize = tr->size();
for ( L1MuDTTrackContainer::TrackContainer::const_iterator i
Expand Down
3 changes: 2 additions & 1 deletion src/L1AnalysisGT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "L1TriggerDPG/L1Ntuples/interface/L1AnalysisGT.h"
#include "stdint.h"


L1Analysis::L1AnalysisGT::L1AnalysisGT()
Expand All @@ -21,7 +22,7 @@ void L1Analysis::L1AnalysisGT::SetEvm(const L1GlobalTriggerEvmReadoutRecord* gte
//orbitn = tcsw.orbitNr();
gt_.partrig_tcs = tcsw.partTrigNr();
L1GtfeExtWord myGtfeExtWord = gtevmrr->gtfeWord();
boost::uint64_t gpsTime = myGtfeExtWord.gpsTime();
uint64_t gpsTime = myGtfeExtWord.gpsTime();

gt_.gpsTimelo = gpsTime&0xffffffff;
gt_.gpsTimehi = (gpsTime>>32)&0xffffffff;
Expand Down
33 changes: 16 additions & 17 deletions src/L1NtupleProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"



//----------------
// Constructor --
//----------------
Expand Down Expand Up @@ -204,18 +203,18 @@ void L1NtupleProducer::endJob() {

void L1NtupleProducer::analyze(const edm::Event& e, const edm::EventSetup& es) {

//add if "none" ..
analyzeEvent(e);
//add if "none" ..
analyzeEvent(e);
analyzeGenerator(e);
analyzeSimulation(e);
analyzeGMT(e);
analyzeGT(e);
analyzeGCT(e);
analyzeRCT(e);
analyzeDTTF(e);
analyzeGMT(e);
analyzeGT(e);
analyzeGCT(e);
analyzeRCT(e);
analyzeDTTF(e);
analyzeCSCTF(e,es);
pL1calotp->Reset();
analyzeECAL(e, es);
analyzeECAL(e, es);
analyzeHCAL(e, es);

tree_->Fill();
Expand Down Expand Up @@ -482,15 +481,15 @@ void L1NtupleProducer::analyzeCSCTF(const edm::Event& e, const edm::EventSetup&
}

// otherwise use the O2O mechanism
else if (es.get< L1MuCSCPtLutRcd > ().cacheIdentifier() != m_csctfptlutCacheID )
{
edm::LogInfo("L1NtupleProducer") << " Initializing the CSCTF ptLUTs via O2O mechanism...";
// initializing the ptLUT from O2O
csctfPtLUTs_ = new CSCTFPtLUT(es);
// else if (es.get< L1MuCSCPtLutRcd > ().cacheIdentifier() != m_csctfptlutCacheID )
// {
// edm::LogInfo("L1NtupleProducer") << " Initializing the CSCTF ptLUTs via O2O mechanism...";
// // initializing the ptLUT from O2O
// csctfPtLUTs_ = new CSCTFPtLUT(es);

m_csctfptlutCacheID = es.get< L1MuCSCPtLutRcd > ().cacheIdentifier();
edm::LogInfo("L1NtupleProducer") << " Changed the cache ID for CSCTF ptLUTs...";
}
// m_csctfptlutCacheID = es.get< L1MuCSCPtLutRcd > ().cacheIdentifier();
// edm::LogInfo("L1NtupleProducer") << " Changed the cache ID for CSCTF ptLUTs...";
// }

if (csctfPtLUTs_ == NULL)
edm::LogWarning("L1NtupleProducer")<<" No valid CSCTFPtLUT initialized!";
Expand Down