From d29527cba641e74a62c0744868ef66e9866eba78 Mon Sep 17 00:00:00 2001
From: Salvatore Di Guida
 <sha1-744703a2e531bf35de4c8c886b1940546bb70d35@cern.ch>
Date: Fri, 23 Oct 2009 12:46:38 +0000
Subject: [PATCH] bug fix: move from cond::Time_t or boost::int64_t to
 boost::uint64_t (waiting for PSet)

---
 .../DQMReferenceHistogramRootFileSourceHandler.h          | 5 +++--
 CondTools/DQM/interface/DQMSummarySourceHandler.h         | 4 +++-
 CondTools/DQM/src/DQMSummarySourceHandler.cc              | 2 +-
 CondTools/DQM/test/DQMReferenceHistogramRootFileTest.py   | 6 +++---
 CondTools/DQM/test/DQMSummaryTest.py                      | 8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h b/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h
index 694f8aa961eab..bab706a4f4187 100644
--- a/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h
+++ b/CondTools/DQM/interface/DQMReferenceHistogramRootFileSourceHandler.h
@@ -3,7 +3,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
-#include "CondFormats/Common/interface/Time.h"
+//#include "CondFormats/Common/interface/Time.h"
 #include "CondFormats/GeometryObjects/interface/GeometryFile.h"
 #include <string>
 
@@ -18,7 +18,8 @@ namespace popcon {
     std::string m_name;
     std::string m_file;
     bool m_zip;
-    cond::Time_t m_since;
+    //cond::Time_t m_since;
+    boost::uint64_t m_since;
     bool m_debugMode;
   };
 }
diff --git a/CondTools/DQM/interface/DQMSummarySourceHandler.h b/CondTools/DQM/interface/DQMSummarySourceHandler.h
index 1aa71b57da239..a06fdd19afafd 100644
--- a/CondTools/DQM/interface/DQMSummarySourceHandler.h
+++ b/CondTools/DQM/interface/DQMSummarySourceHandler.h
@@ -3,6 +3,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
+//#include "CondFormats/Common/interface/Time.h"
 #include "CondFormats/DQMObjects/interface/DQMSummary.h"
 #include <string>
 
@@ -15,7 +16,8 @@ namespace popcon {
     std::string id() const;
    private:
     std::string m_name;
-    boost::int64_t m_since;
+    //cond::Time_t m_since;
+    boost::uint64_t m_since;
     // for reading from omds 
     std::string m_connectionString;
     std::string m_user;
diff --git a/CondTools/DQM/src/DQMSummarySourceHandler.cc b/CondTools/DQM/src/DQMSummarySourceHandler.cc
index ce8bf8316686a..7f33628948566 100644
--- a/CondTools/DQM/src/DQMSummarySourceHandler.cc
+++ b/CondTools/DQM/src/DQMSummarySourceHandler.cc
@@ -10,7 +10,7 @@
 namespace popcon {
   DQMSummarySourceHandler::DQMSummarySourceHandler(const edm::ParameterSet & pset):
     m_name(pset.getUntrackedParameter<std::string>("name","DQMSummarySourceHandler")),
-    m_since(pset.getUntrackedParameter<boost::int64_t>("firstSince",1)), 
+    m_since(pset.getUntrackedParameter<boost::uint64_t>("firstSince",1)), 
     m_user(pset.getUntrackedParameter<std::string>("OnlineDBUser","CMS_DQM_SUMMARY")), 
     m_pass(pset.getUntrackedParameter<std::string>("OnlineDBPass","****")) {
     m_connectionString = "oracle://cms_omds_lb/CMS_DQM_SUMMARY";
diff --git a/CondTools/DQM/test/DQMReferenceHistogramRootFileTest.py b/CondTools/DQM/test/DQMReferenceHistogramRootFileTest.py
index 05cce2195eefd..96d82f7b6c5e4 100644
--- a/CondTools/DQM/test/DQMReferenceHistogramRootFileTest.py
+++ b/CondTools/DQM/test/DQMReferenceHistogramRootFileTest.py
@@ -23,15 +23,15 @@
 process.PoolDBOutputService = cms.Service("PoolDBOutputService",
                                           process.CondDBCommon,
                                           timetype = cms.untracked.string('runnumber'),
-                                          toPut = cms.VPSet(cms.PSet(record = cms.string('DQMReferenceHistogramRootFileRcd'),
+                                          toPut = cms.VPSet(cms.PSet(record = cms.string('GeometryFile'),
                                                                      tag = cms.string('ROOTFILE_Test') 
                                                                      )
                                                             ),
-                                          logconnect = cms.untracked.string('sqlite_file:RPCRootTestLog.db')                                     
+                                          logconnect = cms.untracked.string('sqlite_file:ROOTFILE_TestLog.db')                                     
                                           )
 
 process.dqmReferenceHistogramRootFileTest = cms.EDAnalyzer("DQMReferenceHistogramRootFilePopConAnalyzer",
-                                           record = cms.string('DQMReferenceHistogramRootFileRcd'),
+                                           record = cms.string('GeometryFile'),
                                            loggingOn = cms.untracked.bool(True), #always True, needs to create the log db
                                            SinceAppendMode = cms.bool(True),
                                            Source = cms.PSet(ROOTFile = cms.untracked.string("salvo.root"),
diff --git a/CondTools/DQM/test/DQMSummaryTest.py b/CondTools/DQM/test/DQMSummaryTest.py
index 498dec7684553..92934348ba21d 100644
--- a/CondTools/DQM/test/DQMSummaryTest.py
+++ b/CondTools/DQM/test/DQMSummaryTest.py
@@ -5,7 +5,7 @@
 process.MessageLogger=cms.Service("MessageLogger",
                               destinations=cms.untracked.vstring("cout"),
                               cout=cms.untracked.PSet(
-                              treshold=cms.untracked.string("INFO")
+                              threshold=cms.untracked.string("INFO")
                               )
 )
 
@@ -26,18 +26,18 @@
     process.CondDBCommon,
     timetype = cms.untracked.string('runnumber'), #IOV: 'runnumber'-> number of the run, 'timestamp'-> microseconds starting from 1/1/1970
     toPut = cms.VPSet(cms.PSet(
-        record = cms.string('DQMSummaryRcd'),
+        record = cms.string('DQMSummary'),
         tag = cms.string('DQMSummaryTest') 
          )),
     logconnect= cms.untracked.string('sqlite_file:DQMSummaryLogTest.db')                                     
 )
 
 process.dqmSummaryTest = cms.EDAnalyzer("DQMSummaryPopConAnalyzer",
-    record = cms.string('DQMSummaryRcd'),
+    record = cms.string('DQMSummary'),
     loggingOn = cms.untracked.bool(True), #always True, needs to create the log db
     SinceAppendMode = cms.bool(True),
     Source = cms.PSet(
-    firstSince = cms.untracked.int64(43434) #1, 43434, 46335, 51493, 51500
+    firstSince = cms.untracked.uint64(43434) #1, 43434, 46335, 51493, 51500
     )                            
 )