From 639884f4966ebdf61f6923cd05bae5d4d3f682e9 Mon Sep 17 00:00:00 2001 From: Martin Delcourt Date: Tue, 24 Nov 2015 15:48:18 +0100 Subject: [PATCH 1/5] November test beam changes --- EdmToNtupleNoMask/interface/AnalysisObjects.h | 11 ++-- EdmToNtupleNoMask/plugins/EdmToNtuple.cc | 66 +++++++++++++++++-- EdmToNtupleNoMask/plugins/EdmToNtuple.h | 5 ++ .../python/EdmToNtupleNoMask_cfi.py | 9 ++- EdmToNtupleNoMask/python/__init__.py | 2 +- EdmToNtupleNoMask/src/classes_def.xml | 5 +- EdmToNtupleNoMask/test/treeMaker_cfg.py | 4 +- 7 files changed, 85 insertions(+), 17 deletions(-) diff --git a/EdmToNtupleNoMask/interface/AnalysisObjects.h b/EdmToNtupleNoMask/interface/AnalysisObjects.h index cb58608..279996c 100644 --- a/EdmToNtupleNoMask/interface/AnalysisObjects.h +++ b/EdmToNtupleNoMask/interface/AnalysisObjects.h @@ -24,15 +24,18 @@ namespace tbeam { unsigned int HVsettings; unsigned int DUTangle; uint32_t stubWord; + uint32_t window; + uint32_t offset; + uint32_t cwd; + uint32_t tilt; + uint32_t vcth; int condData; int glibStatus; - int cbc1Status; - int cbc2Status; - + int cbcStatus[16]; std::map< std::string,std::vector > dut_channel; std::map< std::string,std::vector > dut_row; - ClassDef(Event,1) + ClassDef(Event,2) }; } #endif diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc index 531ca59..e43653e 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc @@ -30,7 +30,6 @@ #include #include #include - using namespace Phase2Tracker; EdmToNtupleNoMask::EdmToNtupleNoMask(const edm::ParameterSet& iConfig) : @@ -60,6 +59,18 @@ EdmToNtupleNoMask::EdmToNtupleNoMask(const edm::ParameterSet& iConfig) : stemp = iConfig.getParameter("stubAddress"); stubAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("cwdAddress"); + cwdAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("offsetAddress"); + offsetAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("windowAddress"); + windowAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("tiltAddress"); + tiltAdd_ = std::stoul(stemp, nullptr, 16); + + stemp = iConfig.getParameter("vcthAddress"); + vcthAdd_ = std::stoul(stemp, nullptr, 16); + if(verbosity_) { std::cout << "tdcPhase Address=" << tdcAdd_ << std::endl; std::cout << "HVsettings Address=" << hvAdd_ << std::endl; @@ -83,10 +94,18 @@ void EdmToNtupleNoMask::beginJob() tree_->Branch("hvSettings", &ev.HVsettings); tree_->Branch("dutAngle", &ev.DUTangle); tree_->Branch("stubWord", &ev.stubWord); + tree_->Branch("vcth", &ev.vcth); + tree_->Branch("offset", &ev.offset); + tree_->Branch("window", &ev.window); + tree_->Branch("cwd", &ev.cwd); + tree_->Branch("tilt", &ev.tilt); tree_->Branch("condData", &ev.condData); tree_->Branch("glibStatus", &ev.glibStatus); - tree_->Branch("cbc1Status", &ev.cbc1Status); - tree_->Branch("cbc2Status", &ev.cbc2Status); + for (int i=0; i<16; i++){ + std::stringstream ss; + ss<<"cbc"<Branch(ss.str().c_str(),&ev.cbcStatus[i]); + } tree_->Branch("dut_channel", "std::map< std::string,std::vector >", &ev.dut_channel); tree_->Branch("dut_row", "std::map< std::string,std::vector >", &ev.dut_row); } @@ -142,11 +161,21 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& } } - if( tr_header.getNumberOfCBC() == 2 ) +/* if( tr_header.getNumberOfCBC() == 2 ) { evtInfo.cbc1Status = (int) tr_header.CBCStatus()[0]; evtInfo.cbc2Status = (int) tr_header.CBCStatus()[1]; - } + }*/ + if (tr_header.getNumberOfCBC()==16){ + for (int i=0; i<16; i++){ + evtInfo.cbcStatus[i]=(int) tr_header.CBCStatus()[i]; + } + } + else{ + for(int i=0; i<16; i++){ + evtInfo.cbcStatus[i]=0; + } + } delete buffer; } @@ -159,7 +188,6 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& std::cout << "condition data not found" << std::endl; exit(1); } - std::vector >::const_iterator i_detSet; std::vector::const_iterator j_detSet; @@ -190,6 +218,31 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& evtInfo.DUTangle = value; if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; } + else if(key == tiltAdd_) + { + evtInfo.tilt = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == cwdAdd_) + { + evtInfo.cwd = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == windowAdd_) + { + evtInfo.window = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == vcthAdd_) + { + evtInfo.vcth = value; + if(verbosity_) std::cout << "It corresponds to VCTH angle key" << std::endl; + } + else if(key == offsetAdd_) + { + evtInfo.offset = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } else if(key == stubAdd_) { evtInfo.stubWord = value; @@ -197,7 +250,6 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& } } } - edm::Handle< edm::DetSetVector > input; iEvent.getByLabel( "Phase2TrackerDigiProducer", "Unsparsified", input); diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.h b/EdmToNtupleNoMask/plugins/EdmToNtuple.h index 78b1a75..0fec13c 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.h +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.h @@ -40,6 +40,11 @@ class EdmToNtupleNoMask : public edm::EDAnalyzer uint32_t hvAdd_; uint32_t DUTangAdd_; uint32_t stubAdd_; + uint32_t cwdAdd_; + uint32_t tiltAdd_; + uint32_t vcthAdd_; + uint32_t offsetAdd_; + uint32_t windowAdd_; uint32_t stubWord_; int condData_; diff --git a/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py b/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py index 559624c..c2623e2 100644 --- a/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py +++ b/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py @@ -4,9 +4,14 @@ verbosity = cms.untracked.int32(0), detIdVec = cms.vint32( 50000,50004,51011,51012 ), detNamesVec = cms.vstring( "det0","det1","det2","det3" ), - tdcAddress = cms.string("0x080000000"), + tdcAddress = cms.string("0x03000000"), hvAddress = cms.string("0x05000000"), dutAngAddress = cms.string("0x04000000"), - stubAddress = cms.string("0x0B0000FF") + stubAddress = cms.string("0x0B0000FF"), + cwdAddress = cms.string("0x81000000"), + offsetAddress = cms.string("0x80000000"), + windowAddress = cms.string("0x82000000"), + tiltAddress = cms.string("0x83000000"), + vcthAddress = cms.string("0x08000000") ) diff --git a/EdmToNtupleNoMask/python/__init__.py b/EdmToNtupleNoMask/python/__init__.py index 2c1ef0d..aadbe4d 100644 --- a/EdmToNtupleNoMask/python/__init__.py +++ b/EdmToNtupleNoMask/python/__init__.py @@ -1,3 +1,3 @@ #Automatically created by SCRAM import os -__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/TestBeamAnalysis/EdmToNtupleNoMask/',1)[0])+'/cfipython/slc5_amd64_gcc472/TestBeamAnalysis/EdmToNtupleNoMask') +__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/TestBeamAnalysis/EdmToNtupleNoMask/',1)[0])+'/cfipython/slc6_amd64_gcc472/TestBeamAnalysis/EdmToNtupleNoMask') diff --git a/EdmToNtupleNoMask/src/classes_def.xml b/EdmToNtupleNoMask/src/classes_def.xml index e2a6c66..e326489 100644 --- a/EdmToNtupleNoMask/src/classes_def.xml +++ b/EdmToNtupleNoMask/src/classes_def.xml @@ -1,6 +1,7 @@ - - + + + diff --git a/EdmToNtupleNoMask/test/treeMaker_cfg.py b/EdmToNtupleNoMask/test/treeMaker_cfg.py index 21b235a..a1c7933 100644 --- a/EdmToNtupleNoMask/test/treeMaker_cfg.py +++ b/EdmToNtupleNoMask/test/treeMaker_cfg.py @@ -1,4 +1,6 @@ import FWCore.ParameterSet.Config as cms +import sys + process = cms.Process("treeMaker") @@ -11,7 +13,7 @@ process.source = cms.Source("PoolSource", # replace 'myfile.root' with the source file you want to use fileNames = cms.untracked.vstring( - 'file:/opt/sbg/data/sbgse24/data1/cms/kskovpen/tracker/TB_Jun15/GLIBDAQ/unpacked/USC.00000713.0001.A.storageManager.00.0000.root' + "file:"+sys.argv[2] #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000478.0001.A.storageManager.00.0000.root' #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000371.0001.A.storageManager.00.0000.root' ) From d59cbd9d410c7dadaf49c825942c9add502106a6 Mon Sep 17 00:00:00 2001 From: Martin Delcourt Date: Tue, 24 Nov 2015 16:05:57 +0100 Subject: [PATCH 2/5] November test beam changes --- EdmToNtupleNoMask/plugins/EdmToNtuple.cc | 13 ++++++++----- EdmToNtupleNoMask/test/treeMaker_cfg.py | 6 ++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc index e43653e..2b790f6 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc @@ -161,12 +161,15 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& } } -/* if( tr_header.getNumberOfCBC() == 2 ) + if( tr_header.getNumberOfCBC() == 2 ) { - evtInfo.cbc1Status = (int) tr_header.CBCStatus()[0]; - evtInfo.cbc2Status = (int) tr_header.CBCStatus()[1]; - }*/ - if (tr_header.getNumberOfCBC()==16){ + evtInfo.cbcStatus[0] = (int) tr_header.CBCStatus()[0]; + evtInfo.cbcStatus[1] = (int) tr_header.CBCStatus()[1]; + for(int i = 2 ; i<16; i++){ + evtInfo.cbcStatus[i]=0; + } + } + else if (tr_header.getNumberOfCBC()==16){ for (int i=0; i<16; i++){ evtInfo.cbcStatus[i]=(int) tr_header.CBCStatus()[i]; } diff --git a/EdmToNtupleNoMask/test/treeMaker_cfg.py b/EdmToNtupleNoMask/test/treeMaker_cfg.py index a1c7933..433f647 100644 --- a/EdmToNtupleNoMask/test/treeMaker_cfg.py +++ b/EdmToNtupleNoMask/test/treeMaker_cfg.py @@ -14,15 +14,13 @@ # replace 'myfile.root' with the source file you want to use fileNames = cms.untracked.vstring( "file:"+sys.argv[2] - #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000478.0001.A.storageManager.00.0000.root' - #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000371.0001.A.storageManager.00.0000.root' ) ) process.TFileService = cms.Service("TFileService", - fileName = cms.string('test.root') + fileName = cms.string('file:'+sys.argv[3]) ) -#process.treeMaker.detIdVec = cms.vint32( 51001,51002,51011,51012, 51013 ) +#process.treeMaker.detIdVec = cms.vint32( 51001,51002,51011,51012, 51013 ) process.p = cms.Path(process.treeMaker) From 17f32d219cbab10d7270a14be7c77ec50ac04f68 Mon Sep 17 00:00:00 2001 From: Martin Delcourt Date: Tue, 24 Nov 2015 16:18:04 +0100 Subject: [PATCH 3/5] November beam test modifications --- EdmToNtupleNoMask/interface/AnalysisObjects.h | 11 +-- EdmToNtupleNoMask/plugins/EdmToNtuple.cc | 69 +++++++++++++++++-- EdmToNtupleNoMask/plugins/EdmToNtuple.h | 5 ++ .../python/EdmToNtupleNoMask_cfi.py | 9 ++- EdmToNtupleNoMask/python/__init__.py | 2 +- EdmToNtupleNoMask/src/classes_def.xml | 5 +- EdmToNtupleNoMask/test/treeMaker_cfg.py | 10 +-- 7 files changed, 90 insertions(+), 21 deletions(-) diff --git a/EdmToNtupleNoMask/interface/AnalysisObjects.h b/EdmToNtupleNoMask/interface/AnalysisObjects.h index cb58608..279996c 100644 --- a/EdmToNtupleNoMask/interface/AnalysisObjects.h +++ b/EdmToNtupleNoMask/interface/AnalysisObjects.h @@ -24,15 +24,18 @@ namespace tbeam { unsigned int HVsettings; unsigned int DUTangle; uint32_t stubWord; + uint32_t window; + uint32_t offset; + uint32_t cwd; + uint32_t tilt; + uint32_t vcth; int condData; int glibStatus; - int cbc1Status; - int cbc2Status; - + int cbcStatus[16]; std::map< std::string,std::vector > dut_channel; std::map< std::string,std::vector > dut_row; - ClassDef(Event,1) + ClassDef(Event,2) }; } #endif diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc index 531ca59..2b790f6 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc @@ -30,7 +30,6 @@ #include #include #include - using namespace Phase2Tracker; EdmToNtupleNoMask::EdmToNtupleNoMask(const edm::ParameterSet& iConfig) : @@ -60,6 +59,18 @@ EdmToNtupleNoMask::EdmToNtupleNoMask(const edm::ParameterSet& iConfig) : stemp = iConfig.getParameter("stubAddress"); stubAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("cwdAddress"); + cwdAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("offsetAddress"); + offsetAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("windowAddress"); + windowAdd_ = std::stoul(stemp, nullptr, 16); + stemp = iConfig.getParameter("tiltAddress"); + tiltAdd_ = std::stoul(stemp, nullptr, 16); + + stemp = iConfig.getParameter("vcthAddress"); + vcthAdd_ = std::stoul(stemp, nullptr, 16); + if(verbosity_) { std::cout << "tdcPhase Address=" << tdcAdd_ << std::endl; std::cout << "HVsettings Address=" << hvAdd_ << std::endl; @@ -83,10 +94,18 @@ void EdmToNtupleNoMask::beginJob() tree_->Branch("hvSettings", &ev.HVsettings); tree_->Branch("dutAngle", &ev.DUTangle); tree_->Branch("stubWord", &ev.stubWord); + tree_->Branch("vcth", &ev.vcth); + tree_->Branch("offset", &ev.offset); + tree_->Branch("window", &ev.window); + tree_->Branch("cwd", &ev.cwd); + tree_->Branch("tilt", &ev.tilt); tree_->Branch("condData", &ev.condData); tree_->Branch("glibStatus", &ev.glibStatus); - tree_->Branch("cbc1Status", &ev.cbc1Status); - tree_->Branch("cbc2Status", &ev.cbc2Status); + for (int i=0; i<16; i++){ + std::stringstream ss; + ss<<"cbc"<Branch(ss.str().c_str(),&ev.cbcStatus[i]); + } tree_->Branch("dut_channel", "std::map< std::string,std::vector >", &ev.dut_channel); tree_->Branch("dut_row", "std::map< std::string,std::vector >", &ev.dut_row); } @@ -144,9 +163,22 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& if( tr_header.getNumberOfCBC() == 2 ) { - evtInfo.cbc1Status = (int) tr_header.CBCStatus()[0]; - evtInfo.cbc2Status = (int) tr_header.CBCStatus()[1]; + evtInfo.cbcStatus[0] = (int) tr_header.CBCStatus()[0]; + evtInfo.cbcStatus[1] = (int) tr_header.CBCStatus()[1]; + for(int i = 2 ; i<16; i++){ + evtInfo.cbcStatus[i]=0; + } } + else if (tr_header.getNumberOfCBC()==16){ + for (int i=0; i<16; i++){ + evtInfo.cbcStatus[i]=(int) tr_header.CBCStatus()[i]; + } + } + else{ + for(int i=0; i<16; i++){ + evtInfo.cbcStatus[i]=0; + } + } delete buffer; } @@ -159,7 +191,6 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& std::cout << "condition data not found" << std::endl; exit(1); } - std::vector >::const_iterator i_detSet; std::vector::const_iterator j_detSet; @@ -190,6 +221,31 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& evtInfo.DUTangle = value; if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; } + else if(key == tiltAdd_) + { + evtInfo.tilt = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == cwdAdd_) + { + evtInfo.cwd = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == windowAdd_) + { + evtInfo.window = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } + else if(key == vcthAdd_) + { + evtInfo.vcth = value; + if(verbosity_) std::cout << "It corresponds to VCTH angle key" << std::endl; + } + else if(key == offsetAdd_) + { + evtInfo.offset = value; + if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + } else if(key == stubAdd_) { evtInfo.stubWord = value; @@ -197,7 +253,6 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& } } } - edm::Handle< edm::DetSetVector > input; iEvent.getByLabel( "Phase2TrackerDigiProducer", "Unsparsified", input); diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.h b/EdmToNtupleNoMask/plugins/EdmToNtuple.h index 78b1a75..0fec13c 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.h +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.h @@ -40,6 +40,11 @@ class EdmToNtupleNoMask : public edm::EDAnalyzer uint32_t hvAdd_; uint32_t DUTangAdd_; uint32_t stubAdd_; + uint32_t cwdAdd_; + uint32_t tiltAdd_; + uint32_t vcthAdd_; + uint32_t offsetAdd_; + uint32_t windowAdd_; uint32_t stubWord_; int condData_; diff --git a/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py b/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py index 559624c..c2623e2 100644 --- a/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py +++ b/EdmToNtupleNoMask/python/EdmToNtupleNoMask_cfi.py @@ -4,9 +4,14 @@ verbosity = cms.untracked.int32(0), detIdVec = cms.vint32( 50000,50004,51011,51012 ), detNamesVec = cms.vstring( "det0","det1","det2","det3" ), - tdcAddress = cms.string("0x080000000"), + tdcAddress = cms.string("0x03000000"), hvAddress = cms.string("0x05000000"), dutAngAddress = cms.string("0x04000000"), - stubAddress = cms.string("0x0B0000FF") + stubAddress = cms.string("0x0B0000FF"), + cwdAddress = cms.string("0x81000000"), + offsetAddress = cms.string("0x80000000"), + windowAddress = cms.string("0x82000000"), + tiltAddress = cms.string("0x83000000"), + vcthAddress = cms.string("0x08000000") ) diff --git a/EdmToNtupleNoMask/python/__init__.py b/EdmToNtupleNoMask/python/__init__.py index 2c1ef0d..aadbe4d 100644 --- a/EdmToNtupleNoMask/python/__init__.py +++ b/EdmToNtupleNoMask/python/__init__.py @@ -1,3 +1,3 @@ #Automatically created by SCRAM import os -__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/TestBeamAnalysis/EdmToNtupleNoMask/',1)[0])+'/cfipython/slc5_amd64_gcc472/TestBeamAnalysis/EdmToNtupleNoMask') +__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/TestBeamAnalysis/EdmToNtupleNoMask/',1)[0])+'/cfipython/slc6_amd64_gcc472/TestBeamAnalysis/EdmToNtupleNoMask') diff --git a/EdmToNtupleNoMask/src/classes_def.xml b/EdmToNtupleNoMask/src/classes_def.xml index e2a6c66..e326489 100644 --- a/EdmToNtupleNoMask/src/classes_def.xml +++ b/EdmToNtupleNoMask/src/classes_def.xml @@ -1,6 +1,7 @@ - - + + + diff --git a/EdmToNtupleNoMask/test/treeMaker_cfg.py b/EdmToNtupleNoMask/test/treeMaker_cfg.py index 21b235a..433f647 100644 --- a/EdmToNtupleNoMask/test/treeMaker_cfg.py +++ b/EdmToNtupleNoMask/test/treeMaker_cfg.py @@ -1,4 +1,6 @@ import FWCore.ParameterSet.Config as cms +import sys + process = cms.Process("treeMaker") @@ -11,16 +13,14 @@ process.source = cms.Source("PoolSource", # replace 'myfile.root' with the source file you want to use fileNames = cms.untracked.vstring( - 'file:/opt/sbg/data/sbgse24/data1/cms/kskovpen/tracker/TB_Jun15/GLIBDAQ/unpacked/USC.00000713.0001.A.storageManager.00.0000.root' - #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000478.0001.A.storageManager.00.0000.root' - #'root://eoscms//store/cmst3/user/gauzinge/Data/edmnew/USC.00000371.0001.A.storageManager.00.0000.root' + "file:"+sys.argv[2] ) ) process.TFileService = cms.Service("TFileService", - fileName = cms.string('test.root') + fileName = cms.string('file:'+sys.argv[3]) ) -#process.treeMaker.detIdVec = cms.vint32( 51001,51002,51011,51012, 51013 ) +#process.treeMaker.detIdVec = cms.vint32( 51001,51002,51011,51012, 51013 ) process.p = cms.Path(process.treeMaker) From 6868a07365b320b1b1272cbae74d8048626aeacc Mon Sep 17 00:00:00 2001 From: Martin Delcourt Date: Tue, 24 Nov 2015 16:21:04 +0100 Subject: [PATCH 4/5] November test beam modifications --- EdmToNtupleNoMask/plugins/EdmToNtuple.cc | 16 ++++++++-------- EdmToNtupleNoMask/python/__init__.py | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 EdmToNtupleNoMask/python/__init__.py diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc index 2b790f6..061800e 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc @@ -209,42 +209,42 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& if(key == tdcAdd_) { evtInfo.tdcPhase = value; - if(verbosity_) std::cout << "It corresponds to TDC key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the TDC key" << std::endl; } else if(key == hvAdd_) { evtInfo.HVsettings = value; - if(verbosity_) std::cout << "It corresponds to HV key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the HV key" << std::endl; } else if(key == DUTangAdd_) { evtInfo.DUTangle = value; - if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the DUT angle key" << std::endl; } else if(key == tiltAdd_) { evtInfo.tilt = value; - if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the tilt angle key" << std::endl; } else if(key == cwdAdd_) { evtInfo.cwd = value; - if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the cluster width discriminator key" << std::endl; } else if(key == windowAdd_) { evtInfo.window = value; - if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the stub window size angle key" << std::endl; } else if(key == vcthAdd_) { evtInfo.vcth = value; - if(verbosity_) std::cout << "It corresponds to VCTH angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the VCTH key" << std::endl; } else if(key == offsetAdd_) { evtInfo.offset = value; - if(verbosity_) std::cout << "It corresponds to DUT angle key" << std::endl; + if(verbosity_) std::cout << "It corresponds to the offset parameter key" << std::endl; } else if(key == stubAdd_) { diff --git a/EdmToNtupleNoMask/python/__init__.py b/EdmToNtupleNoMask/python/__init__.py deleted file mode 100644 index aadbe4d..0000000 --- a/EdmToNtupleNoMask/python/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -#Automatically created by SCRAM -import os -__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/TestBeamAnalysis/EdmToNtupleNoMask/',1)[0])+'/cfipython/slc6_amd64_gcc472/TestBeamAnalysis/EdmToNtupleNoMask') From 1c2b9d2587a5055fb850e003e73a58eb79ae2b23 Mon Sep 17 00:00:00 2001 From: Martin Delcourt Date: Mon, 21 Mar 2016 20:41:51 +0100 Subject: [PATCH 5/5] Removed outdated sparsified code --- EdmToNtupleNoMask/plugins/EdmToNtuple.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc index 061800e..6ac6348 100644 --- a/EdmToNtupleNoMask/plugins/EdmToNtuple.cc +++ b/EdmToNtupleNoMask/plugins/EdmToNtuple.cc @@ -280,7 +280,7 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& } } - edm::Handle< edmNew::DetSetVector > inputCluster; + /*edm::Handle< edmNew::DetSetVector > inputCluster; iEvent.getByLabel( "Phase2TrackerDigiProducer", "Sparsified", inputCluster); if( !inputCluster.isValid() ) @@ -294,7 +294,7 @@ void EdmToNtupleNoMask::analyze(const edm::Event& iEvent, const edm::EventSetup& { // uint32_t detid = itc->id(); } - + */ ev = evtInfo; tree_->Fill(); }