test suite #1

jpavel · Jun 24, 2014 · c142e63 · c142e63
1 parent dcf13f5
commit c142e63
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 23 deletions.
diff --git a/DQMServices/Components/python/test/create_filePB_cfg.py b/DQMServices/Components/python/test/create_filePB_cfg.py
@@ -13,11 +13,11 @@
 b = booking.BookingParams(sys.argv)
 b.doCheck(testOnly=False)
 
-process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(25))
+process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(10))
 process.source = cms.Source("EmptySource",
                             firstLuminosityBlock = cms.untracked.uint32(1),
                             firstEvent = cms.untracked.uint32(1),
-                            numberEventsInLuminosityBlock = cms.untracked.uint32(10))
+                            numberEventsInLuminosityBlock = cms.untracked.uint32(1))
 
 
 elements = c.createElements()

diff --git a/DQMServices/Components/python/test/create_filePB_ref_cfg.py b/DQMServices/Components/python/test/create_filePB_ref_cfg.py
@@ -13,11 +13,11 @@
 b = booking.BookingParams(sys.argv)
 b.doCheck(testOnly=False)
 
-process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(25))
+process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(10))
 process.source = cms.Source("EmptySource",
                             firstLuminosityBlock = cms.untracked.uint32(1),
                             firstEvent = cms.untracked.uint32(1),
-                            numberEventsInLuminosityBlock = cms.untracked.uint32(10))
+                            numberEventsInLuminosityBlock = cms.untracked.uint32(1))
 
 
 elements = c.createElements()
@@ -64,9 +64,15 @@
         process.DQMStore.forceResetOnBeginRun = cms.untracked.bool(True)
 
 
-#----------------------------------------------------------#
-#global options
-#process.DQMStore.LSbasedMode = cms.untracked.bool(True)
-#process.DQMStore.verbose = cms.untracked.int32(5)
+#----------------------------------------------------------#                                                                                                                                      
+### global options Online ###                                                                                                                                                                       
+process.DQMStore.LSbasedMode = cms.untracked.bool(False)
+process.DQMStore.verbose = cms.untracked.int32(5)
 
-#process.add_(cms.Service("Tracer"))
+process.dqmSaver.workflow = ''
+process.dqmSaver.convention = 'FilterUnit'
+process.dqmSaver.saveByLumiSection = -1
+process.dqmSaver.fileFormat = cms.untracked.string('ROOT')
+process.dqmSaver.fakeFilterUnitMode = cms.untracked.bool(True)
+
+#process.add_(cms.Service("Tracer"))              
diff --git a/DQMServices/Components/python/test/harv_filePB_cfg.py b/DQMServices/Components/python/test/harv_filePB_cfg.py
@@ -25,14 +25,17 @@
                              resolution = cms.vstring(),
                              subDirs = cms.untracked.vstring(folder))
 
-process.dqmSaver.workflow = cms.untracked.string("/Test/FilePB/DQM")
-process.dqmSaver.saveByLumiSection = cms.untracked.int32(1)
+process.dqmSaver.workflow = cms.untracked.string("")
+process.dqmSaver.saveByLumiSection = cms.untracked.int32(-1)
 process.dqmSaver.saveByRun = cms.untracked.int32(1)
+process.dqmSaver.convention = 'Online'
+
 
 process.p = cms.Path(process.harvester + process.eff)
 process.o = cms.EndPath(process.dqmSaver)
 
 process.add_(cms.Service("DQMStore"))
-#process.DQMStore.verbose = cms.untracked.int32(3)
+process.DQMStore.verbose = cms.untracked.int32(5)
+
 #process.add_(cms.Service("Tracer"))
 
diff --git a/DQMServices/Components/python/test/harv_filePB_ref_cfg.py b/DQMServices/Components/python/test/harv_filePB_ref_cfg.py
@@ -26,9 +26,10 @@
                              resolution = cms.vstring(),
                              subDirs = cms.untracked.vstring(folder))
 
-process.dqmSaver.workflow = cms.untracked.string("/Test/FilePBref/DQM")
-process.dqmSaver.saveByLumiSection = cms.untracked.int32(1)
+process.dqmSaver.workflow = cms.untracked.string("")
+process.dqmSaver.saveByLumiSection = cms.untracked.int32(-1)
 process.dqmSaver.saveByRun = cms.untracked.int32(1)
+process.dqmSaver.convention = 'Online'
 
 process.p = cms.Path(process.harvester + process.eff)
 process.o = cms.EndPath(process.dqmSaver)

diff --git a/DQMServices/Components/test/DummyBookFillDQMStore.cc b/DQMServices/Components/test/DummyBookFillDQMStore.cc
@@ -263,6 +263,11 @@ void
 DummyBookFillDQMStore::analyze(edm::Event const& iEvent,
                                edm::EventSetup const& iSetup) {
 
+  std::vector<boost::shared_ptr<FillerBase> >::iterator it = m_runFillers.begin();
+  std::vector<boost::shared_ptr<FillerBase> >::iterator ite = m_runFillers.end();
+  for (; it != ite; ++it)
+    (*it)->fill();
+  std::cout << "filling histos" << std::endl;
 
 
 //   using namespace edm;
@@ -292,11 +297,6 @@ void DummyBookFillDQMStore::beginJob() {
 
 // ------------ method called once each job just after ending the event loop  ------------
 void DummyBookFillDQMStore::endJob() {
-  std::vector<boost::shared_ptr<FillerBase> >::iterator it = m_runFillers.begin();
-  std::vector<boost::shared_ptr<FillerBase> >::iterator ite = m_runFillers.end();
-  for (; it != ite; ++it)
-    (*it)->fill();
-  std::cout << "filling histos" << std::endl;
 }
 
 // ------------ method called when starting to processes a run  ------------

diff --git a/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc b/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc
@@ -257,6 +257,11 @@ void
 DummyBookFillDQMStoreMultiThread::analyze(edm::Event const& iEvent,
                                edm::EventSetup const& iSetup) {
 
+  std::vector<boost::shared_ptr<FillerBase> >::iterator it = m_runFillers.begin();
+  std::vector<boost::shared_ptr<FillerBase> >::iterator ite = m_runFillers.end();
+  for (; it != ite; ++it)
+    (*it)->fill();
+
 //   using namespace edm;
   /* This is an event example
   //Read 'ExampleData' from the Event
@@ -286,10 +291,6 @@ void DummyBookFillDQMStoreMultiThread::endJob() {
 
 // ------------ method called when ending the processing of a run  ------------
 void DummyBookFillDQMStoreMultiThread::endRun(edm::Run const&, edm::EventSetup const&) {
-  std::vector<boost::shared_ptr<FillerBase> >::iterator it = m_runFillers.begin();
-  std::vector<boost::shared_ptr<FillerBase> >::iterator ite = m_runFillers.end();
-  for (; it != ite; ++it)
-    (*it)->fill();
 }
 
 // ------------ method called when starting to processes a luminosity block  ------------