Commit 20d13223 authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #214: add GEM datapoints and remove notification log messages

parent c72ebe63
......@@ -5,8 +5,8 @@
#define WORKSUITE_EVB_VERSION_MAJOR 6
#define WORKSUITE_EVB_VERSION_MINOR 9
#define WORKSUITE_EVB_VERSION_PATCH 2
#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1,6.8.0,6.8.1,6.8.2,6.9.0,6.9.1"
#define WORKSUITE_EVB_VERSION_PATCH 3
#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1,6.8.0,6.8.1,6.8.2,6.9.0,6.9.1,6.9.2"
#define WORKSUITE_EVB_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_EVB_VERSION_MAJOR,WORKSUITE_EVB_VERSION_MINOR,WORKSUITE_EVB_VERSION_PATCH)
#ifndef WORKSUITE_EVB_PREVIOUS_VERSIONS
......
......@@ -89,14 +89,18 @@ evb::readoutunit::MetaDataRetrieverDIPBridge::MetaDataRetrieverDIPBridge(
dipTopicsMap_["dip/CMS/DCS/CMS_ECAL/CMS_ECAL_ESP/state"]= 23;
dipTopics_.push_back( DipTopic("dip/CMS/DCS/CMS_ECAL/CMS_ECAL_ESM/state",unavailable) );
dipTopicsMap_["dip/CMS/DCS/CMS_ECAL/CMS_ECAL_ESM/state"]= 24;
dipTopics_.push_back( DipTopic("dip/CMS/DCS/CMS_GEM/CMS_GEM_EP/state",unavailable) );
dipTopicsMap_["dip/CMS/DCS/CMS_GEM/CMS_GEM_EP/state"]= 25;
dipTopics_.push_back( DipTopic("dip/CMS/DCS/CMS_GEM/CMS_GEM_EM/state",unavailable) );
dipTopicsMap_["dip/CMS/DCS/CMS_GEM/CMS_GEM_EM/state"]= 26;
dipTopics_.push_back( DipTopic("dip/CMS/MCS/Current",unavailable) );
dipTopicsMap_["dip/CMS/MCS/Current"]= 25;
dipTopicsMap_["dip/CMS/MCS/Current"]= 27;
dipTopics_.push_back( DipTopic("dip/CMS/BRIL/Luminosity",unavailable) );
dipTopicsMap_["dip/CMS/BRIL/Luminosity"]= 26;
dipTopicsMap_["dip/CMS/BRIL/Luminosity"]= 28;
dipTopics_.push_back( DipTopic("dip/CMS/Tracker/BeamSpot",unavailable) );
dipTopicsMap_["dip/CMS/Tracker/BeamSpot"]= 27;
dipTopicsMap_["dip/CMS/Tracker/BeamSpot"]= 29;
dipTopics_.push_back( DipTopic("dip/CMS/CTPPS/detectorFSM",unavailable) );
dipTopicsMap_["dip/CMS/CTPPS/detectorFSM"]= 28;
dipTopicsMap_["dip/CMS/CTPPS/detectorFSM"]= 30;
b2in::nub::deferredbind(this->getOwnerApplication(),this, &evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage);
dipBridgeSubscriptions_ = false;
......@@ -257,20 +261,19 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "AvgPileUp");
lastLuminosity_.avgPileUp = dynamic_cast<xdata::Float*>(p)->value_;
msg << "Got a 'dip/CMS/BRIL/Luminosity' notification: diptime=" << dipTime <<
/*msg << "Got a 'dip/CMS/BRIL/Luminosity' notification: diptime=" << dipTime <<
" lumiSection=" << lastLuminosity_.lumiSection << " LumiNibble=" <<
lastLuminosity_.lumiNibble << " InstLumi=" << lastLuminosity_.instLumi <<
" AvgPileUp=" << lastLuminosity_.avgPileUp;
LOG4CPLUS_INFO(logger_,msg.str());
LOG4CPLUS_INFO(logger_,msg.str());*/
}
else if ( topicName == "dip/CMS/Tracker/BeamSpot" )
{
std::lock_guard<std::mutex> guard(beamSpotMutex_);
//lastBeamSpot_.timeStamp = dipData.extractDipTime().getAsMillis();
lastBeamSpot_.timeStamp = dipTime;
msg << "Got a 'dip/CMS/Tracker/BeamSpot': diptime=" << dipTime;
//msg << "Got a 'dip/CMS/Tracker/BeamSpot': diptime=" << dipTime;
//lastBeamSpot_.x = dipData.extractFloat("x");
p = table.getValueAt(0, "x");
......@@ -284,7 +287,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "z");
lastBeamSpot_.z = dynamic_cast<xdata::Float*>(p)->value_;
msg << ", x=" << lastBeamSpot_.x << ", y=" << lastBeamSpot_.y <<", z=" << lastBeamSpot_.z;
//msg << ", x=" << lastBeamSpot_.x << ", y=" << lastBeamSpot_.y <<", z=" << lastBeamSpot_.z;
//lastBeamSpot_.widthX = dipData.extractFloat("width_x");
p = table.getValueAt(0, "width_x");
......@@ -298,7 +301,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "sigma_z");
lastBeamSpot_.sigmaZ = dynamic_cast<xdata::Float*>(p)->value_;
msg << ", width_x=" << lastBeamSpot_.widthX << ", width_y=" << lastBeamSpot_.widthY << ", sigma_z=" << lastBeamSpot_.sigmaZ;
//msg << ", width_x=" << lastBeamSpot_.widthX << ", width_y=" << lastBeamSpot_.widthY << ", sigma_z=" << lastBeamSpot_.sigmaZ;
//lastBeamSpot_.errX = dipData.extractFloat("err_x");
p = table.getValueAt(0, "err_x");
......@@ -312,7 +315,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "err_z");
lastBeamSpot_.errZ = dynamic_cast<xdata::Float*>(p)->value_;
msg << ", err_x=" << lastBeamSpot_.errX << ", err_y=" << lastBeamSpot_.errY << ", err_z=" << lastBeamSpot_.errZ;
//msg << ", err_x=" << lastBeamSpot_.errX << ", err_y=" << lastBeamSpot_.errY << ", err_z=" << lastBeamSpot_.errZ;
//lastBeamSpot_.errWidthX = dipData.extractFloat("err_width_x");
p = table.getValueAt(0, "err_width_x");
......@@ -326,7 +329,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "err_sigma_z");
lastBeamSpot_.errSigmaZ = dynamic_cast<xdata::Float*>(p)->value_;
msg << ", err_width_x="<< lastBeamSpot_.errWidthX << ", err_width_y="<< lastBeamSpot_.errWidthY << ", err_sigma_z="<< lastBeamSpot_.errSigmaZ;
//msg << ", err_width_x="<< lastBeamSpot_.errWidthX << ", err_width_y="<< lastBeamSpot_.errWidthY << ", err_sigma_z="<< lastBeamSpot_.errSigmaZ;
//lastBeamSpot_.dxdz = dipData.extractFloat("dxdz");
p = table.getValueAt(0, "dxdz");
......@@ -344,8 +347,8 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "err_dydz");
lastBeamSpot_.errDydz = dynamic_cast<xdata::Float*>(p)->value_;
msg << ", dxdz=" << lastBeamSpot_.dxdz << ", dydz=" << lastBeamSpot_.dydz << ", err_dxdz="<< lastBeamSpot_.errDxdz << ", err_dydz="<< lastBeamSpot_.errDydz;
LOG4CPLUS_INFO(logger_,msg.str());
//msg << ", dxdz=" << lastBeamSpot_.dxdz << ", dydz=" << lastBeamSpot_.dydz << ", err_dxdz="<< lastBeamSpot_.errDxdz << ", err_dydz="<< lastBeamSpot_.errDydz;
//LOG4CPLUS_INFO(logger_,msg.str());
}
else if ( topicName == "dip/CMS/CTPPS/detectorFSM" )
{
......@@ -360,9 +363,9 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
uint64_t status = static_cast<uint64_t>(dynamic_cast<xdata::Integer32*>(p)->value_);
lastCTPPS_.status |= (status & 0x3) << (i*2);
}
msg << "Got a 'dip/CMS/CTPPS/detectorFSM' notification: diptime=" << dipTime <<
/* msg << "Got a 'dip/CMS/CTPPS/detectorFSM' notification: diptime=" << dipTime <<
" status=" << lastCTPPS_.status;
LOG4CPLUS_INFO(logger_, msg.str());
LOG4CPLUS_INFO(logger_, msg.str());*/
}
else if ( topicName == "dip/CMS/MCS/Current" )
......@@ -372,9 +375,9 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "__DIP_DEFAULT__");
lastDCS_.magnetCurrent = dynamic_cast<xdata::Float*>(p)->value_;
msg << "Got a 'dip/CMS/MCS/Current' notification: diptime=" << dipTime <<
/* msg << "Got a 'dip/CMS/MCS/Current' notification: diptime=" << dipTime <<
" magnetCurrent=" << lastDCS_.magnetCurrent;
LOG4CPLUS_INFO(logger_, msg.str());
LOG4CPLUS_INFO(logger_, msg.str()); */
}
else
{
......
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