Commit 6a335ce9 authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #272: implemented differen behaviour when the BRIL data is not available

parent 7a4362c8
......@@ -34,7 +34,7 @@ namespace oms {
xdata::Table getTableDefinitionFromDB(const std::string& queryName);
void insertTable(const std::string& queryName, xdata::Table& dataToInsert);
void updateTable(const std::string& queryName, xdata::Table& dataToUpdate);
xdaq::Application* app_;
private:
......@@ -45,7 +45,6 @@ namespace oms {
void renew();
xoap::MessageReference sendSOAPMessage(xoap::MessageReference&);
xdaq::Application* app_;
const std::string credentialsFile_;
const std::string tstoreView_;
const std::string viewClass_;
......
......@@ -4,9 +4,9 @@
#include "config/PackageInfo.h"
#define WORKSUITE_OMS_VERSION_MAJOR 1
#define WORKSUITE_OMS_VERSION_MINOR 3
#define WORKSUITE_OMS_VERSION_MINOR 4
#define WORKSUITE_OMS_VERSION_PATCH 0
#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2,1.0.3,1.1.0,1.1.1,1.1.2,1.2.0"
#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2,1.0.3,1.1.0,1.1.1,1.1.2,1.2.0,1.3.0"
#define WORKSUITE_OMS_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_OMS_VERSION_MAJOR,WORKSUITE_OMS_VERSION_MINOR,WORKSUITE_OMS_VERSION_PATCH)
#ifndef WORKSUITE_OMS_PREVIOUS_VERSIONS
......
......@@ -43,11 +43,12 @@ void oms::LumisectionClient::insertNewLumisection(const LumisectionEntryPtr& lum
newLumisection.setValueAt(0,"RUN_NUMBER",run);
newLumisection.setValueAt(0,"LUMISECTION_NUMBER",ls);
newLumisection.setValueAt(0,"CMS_ACTIVE",cmsActive);
newLumisection.setValueAt(0,"INSTANTANEOUS_LUMI",instantaneousLumi);
newLumisection.setValueAt(0,"DELIVERED_LUMI",deliveredLumi);
newLumisection.setValueAt(0,"RECORDED_LUMI",recordedLumi);
newLumisection.setValueAt(0,"AVG_PILEUP",avgPileup);
if (lumisectionEntry->brilUpdates > 0 ) {
newLumisection.setValueAt(0,"INSTANTANEOUS_LUMI",instantaneousLumi);
newLumisection.setValueAt(0,"DELIVERED_LUMI",deliveredLumi);
newLumisection.setValueAt(0,"RECORDED_LUMI",recordedLumi);
newLumisection.setValueAt(0,"AVG_PILEUP",avgPileup);
}
insertTable("insertNewLumisection",newLumisection);
}
catch (xcept::Exception& e)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment