Commit 1444c10c authored by Laurent Petre's avatar Laurent Petre
Browse files

Merge branch 'cleanup/gemmanagers-renaming' into 'develop'

Rename gem::hardware::managers as gem::managers

Closes #144

See merge request cmsgemonline/cmsgemos!93
parents cd646b56 fbc60b46
Pipeline #2278781 failed with stages
in 7 minutes and 49 seconds
......@@ -75,7 +75,7 @@ add_subdirectory(gembase)
add_subdirectory(gemcalibration)
add_subdirectory(gemcore)
add_subdirectory(gemexpert)
add_subdirectory(gemhardware)
add_subdirectory(gemmanagers)
add_subdirectory(gemmonitor)
add_subdirectory(gemreadout)
add_subdirectory(gemrpc)
......
......@@ -45,11 +45,11 @@
</xc:Application>
<!-- ID namespace: 4... -->
<xc:Module>${CMSGEMOS_LIBDIR}/libgemhardware_managers.so</xc:Module>
<xc:Module>${CMSGEMOS_LIBDIR}/libgemmanagers.so</xc:Module>
<!-- ID: 4xyy, instance: xyy, x = shelf, yy = slot -->
<xc:Application class="gem::hardware::AMCManager" id="4102" instance="102" network="local">
<properties xmlns="urn:xdaq-application:gem::hardware::AMCManager" xsi:type="soapenc:Struct">
<xc:Application class="gem::managers::AMCManager" id="4102" instance="102" network="local">
<properties xmlns="urn:xdaq-application:gem::managers::AMCManager" xsi:type="soapenc:Struct">
<!-- Output of calibration Scan -->
<outputPath xsi:type="xsd:string">${TMPDIR}/gemdata</outputPath>
......@@ -65,8 +65,8 @@
</xc:Application>
<!-- ID: 4x13, instance: x13, x = shelf -->
<xc:Application class="gem::hardware::AMC13Manager" id="4113" instance="113" network="local">
<properties xmlns="urn:xdaq-application:gem::hardware::AMC13Manager" xsi:type="soapenc:Struct">
<xc:Application class="gem::managers::AMC13Manager" id="4113" instance="113" network="local">
<properties xmlns="urn:xdaq-application:gem::managers::AMC13Manager" xsi:type="soapenc:Struct">
<amc13ConfigParams xsi:type="soapenc:Struct">
<ConnectionFile xsi:type="xsd:string">connections.xml</ConnectionFile>
<CardName xsi:type="xsd:string">gem.shelf01.amc13</CardName>
......
cmsgemos_add_module(
hardware
)
add_subdirectory(managers)
cmsgemos_add_module(
managers
SOURCES
version.cpp
AMCManager.cpp
AMCManagerWeb.cpp
AMC13Manager.cpp
AMC13ManagerWeb.cpp
)
target_link_libraries(gemhardware_managers PUBLIC gembase)
target_link_libraries(gemhardware_managers PUBLIC gemutils)
target_link_libraries(gemhardware_managers PUBLIC CACTUS::uhal_uhal)
target_link_libraries(gemhardware_managers PUBLIC xDAQ::toolbox)
target_link_libraries(gemhardware_managers PUBLIC Boost::system)
target_link_libraries(gemhardware_managers PRIVATE gemcalibration)
target_link_libraries(gemhardware_managers PRIVATE gemrpc)
target_link_libraries(gemhardware_managers PRIVATE xhal::client)
target_link_libraries(gemhardware_managers PRIVATE CACTUS::amc13_amc13)
target_link_libraries(gemhardware_managers PRIVATE CACTUS::uhal_log)
target_link_libraries(gemhardware_managers PRIVATE xDAQ::config)
target_link_libraries(gemhardware_managers PRIVATE xDAQ::toolbox)
target_link_libraries(gemhardware_managers PRIVATE xDAQ::xcept)
target_link_libraries(gemhardware_managers PRIVATE xDAQ::xdaq)
target_link_libraries(gemhardware_managers PRIVATE xDAQ::xoap)
target_link_libraries(gemhardware_managers PRIVATE stdc++fs)
/// @file gem/hardware/managers/optohybrid/Exception.h */
#ifndef GEM_HARDWARE_MANAGERS_OPTOHYBRID_EXCEPTION_EXCEPTION_H
#define GEM_HARDWARE_MANAGERS_OPTOHYBRID_EXCEPTION_EXCEPTION_H
#include "gem/utils/exception/Exception.h"
// The gem::hardware::managers::optohybrid exceptions.
#define GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(EXCEPTION_NAME) GEM_DEFINE_EXCEPTION(EXCEPTION_NAME, hardware::managers::optohybrid)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(Exception)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(ConfigurationParseProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(ConfigurationProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(ConfigurationValidationProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(HardwareProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(InvalidLink)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(RCMSNotificationError)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(SOAPTransitionProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(TransitionProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(SoftwareProblem)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(ValueError)
// The gem::hardware::managers::optohybrid alarms.
#define GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_ALARM(ALARM_NAME) GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_EXCEPTION(ALARM_NAME)
GEM_HARDWARE_MANAGERS_OPTOHYBRID_DEFINE_ALARM(MonitoringFailureAlarm)
#endif // GEM_HARDWARE_MANAGERS_OPTOHYBRID_EXCEPTION_EXCEPTION_H
/// @file version.cpp
#ifndef DOXYGEN_IGNORE_THIS
#include "config/PackageInfo.h"
namespace gem {
namespace hardware {
namespace managers {
const std::string project = "cmsgemos";
const std::string package = "gem::hardware::managers";
const std::string versions = PACKAGE_VERSION_STRING(0, 0, 0);
const std::string summary = "";
const std::string description = "";
const std::string authors = "";
const std::string link = "";
config::PackageInfo getPackageInfo();
void checkPackageDependencies() {}
std::set<std::string> getPackageDependencies() { return {}; }
}
}
}
GETPACKAGEINFO(gem::hardware::managers);
#endif // DOXYGEN_IGNORE_THIS
cmsgemos_add_module(
managers
SOURCES
version.cpp
AMCManager.cpp
AMCManagerWeb.cpp
AMC13Manager.cpp
AMC13ManagerWeb.cpp
)
target_link_libraries(gemmanagers PUBLIC gembase)
target_link_libraries(gemmanagers PUBLIC gemutils)
target_link_libraries(gemmanagers PUBLIC CACTUS::uhal_uhal)
target_link_libraries(gemmanagers PUBLIC xDAQ::toolbox)
target_link_libraries(gemmanagers PUBLIC Boost::system)
target_link_libraries(gemmanagers PRIVATE gemcalibration)
target_link_libraries(gemmanagers PRIVATE gemrpc)
target_link_libraries(gemmanagers PRIVATE xhal::client)
target_link_libraries(gemmanagers PRIVATE CACTUS::amc13_amc13)
target_link_libraries(gemmanagers PRIVATE CACTUS::uhal_log)
target_link_libraries(gemmanagers PRIVATE xDAQ::config)
target_link_libraries(gemmanagers PRIVATE xDAQ::toolbox)
target_link_libraries(gemmanagers PRIVATE xDAQ::xcept)
target_link_libraries(gemmanagers PRIVATE xDAQ::xdaq)
target_link_libraries(gemmanagers PRIVATE xDAQ::xoap)
target_link_libraries(gemmanagers PRIVATE stdc++fs)
/// @file AMC13Manager.h
#ifndef GEM_HARDWARE_AMC13MANAGER_H
#define GEM_HARDWARE_AMC13MANAGER_H
#ifndef GEM_MANAGERS_AMC13MANAGER_H
#define GEM_MANAGERS_AMC13MANAGER_H
#include <gem/base/GEMFSMApplication.h>
......@@ -20,7 +20,7 @@ class Status;
}
namespace gem {
namespace hardware {
namespace managers {
typedef std::shared_ptr<::amc13::Status> amc13_status_ptr;
typedef std::shared_ptr<::amc13::AMC13> amc13_ptr;
......@@ -247,7 +247,7 @@ namespace hardware {
protected:
}; // class AMC13Manager
} // namespace gem::hardware
} // namespace gem::managers
} // namespace gem
#endif // GEM_HARDWARE_AMC13MANAGER_H
#endif // GEM_MANAGERS_AMC13MANAGER_H
/// @file AMC13ManagerWeb.h
#ifndef GEM_HARDWARE_AMC13MANAGERWEB_H
#define GEM_HARDWARE_AMC13MANAGERWEB_H
#ifndef GEM_MANAGERS_AMC13MANAGERWEB_H
#define GEM_MANAGERS_AMC13MANAGERWEB_H
#include <gem/base/GEMWebApplication.h>
#include <memory>
namespace gem {
namespace hardware {
namespace managers {
class AMC13Manager;
......@@ -39,7 +39,7 @@ namespace hardware {
size_t level;
};
} // namespace gem::hardware
} // namespace gem::managers
} // namespace gem
#endif // GEM_HARDWARE_AMC13MANAGERWEB_H
#endif // GEM_MANAGERS_AMC13MANAGERWEB_H
/// @file AMCManager.h
#ifndef GEM_HARDWARE_AMCMANAGER_H
#define GEM_HARDWARE_AMCMANAGER_H
#ifndef GEM_MANAGERS_AMCMANAGER_H
#define GEM_MANAGERS_AMCMANAGER_H
#include "gem/base/GEMFSMApplication.h"
......@@ -16,7 +16,7 @@ class XHALInterface;
using xhal_interface_shared_ptr = std::shared_ptr<xhal::client::XHALInterface>;
namespace gem {
namespace hardware {
namespace managers {
class AMCManagerWeb;
......@@ -69,7 +69,7 @@ namespace hardware {
xoap::MessageReference launchScan(xoap::MessageReference msg);
}; // class AMCManager
} // namespace gem::hardware
} // namespace gem::managers
} // namespace gem
#endif // GEM_HARDWARE_AMCMANAGER_H
#endif // GEM_MANAGERS_AMCMANAGER_H
/// @file AMCManagerWeb.h
#ifndef GEM_HARDWARE_AMCMANAGERWEB_H
#define GEM_HARDWARE_AMCMANAGERWEB_H
#ifndef GEM_MANAGERS_AMCMANAGERWEB_H
#define GEM_MANAGERS_AMCMANAGERWEB_H
#include "gem/base/GEMWebApplication.h"
namespace gem {
namespace hardware {
namespace managers {
class AMCManager;
......@@ -27,7 +27,7 @@ namespace hardware {
void registerDumpPage(xgi::Input* in, xgi::Output* out);
};
} // namespace gem::hardware
} // namespace gem::managers
} // namespace gem
#endif // GEM_HARDWARE_AMCMANAGERWEB_H
#endif // GEM_MANAGERS_AMCMANAGERWEB_H
/// @file gem/hardware/managers/exception/Exception.h */
/// @file gem/managers/exception/Exception.h */
#ifndef GEM_HARDWARE_MANAGERS_EXCEPTION_EXCEPTION_H
#define GEM_HARDWARE_MANAGERS_EXCEPTION_EXCEPTION_H
#ifndef GEM_MANAGERS_EXCEPTION_EXCEPTION_H
#define GEM_MANAGERS_EXCEPTION_EXCEPTION_H
#include "gem/utils/exception/Exception.h"
// The gem::hardware exceptions.
#define GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(EXCEPTION_NAME) GEM_DEFINE_EXCEPTION(EXCEPTION_NAME, hardware::managers)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(Exception)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(WriteValueMismatch)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(ConfigurationParseProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(ConfigurationProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(ConfigurationValidationProblem)
// The gem::managers exceptions.
#define GEM_MANAGERS_DEFINE_EXCEPTION(EXCEPTION_NAME) GEM_DEFINE_EXCEPTION(EXCEPTION_NAME, managers)
GEM_MANAGERS_DEFINE_EXCEPTION(Exception)
GEM_MANAGERS_DEFINE_EXCEPTION(WriteValueMismatch)
GEM_MANAGERS_DEFINE_EXCEPTION(ConfigurationParseProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(ConfigurationProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(ConfigurationValidationProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(HardwareProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(UninitializedDevice)
GEM_MANAGERS_DEFINE_EXCEPTION(HardwareProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(UninitializedDevice)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(RCMSNotificationError)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(SOAPTransitionProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(NULLReadoutPointer)
GEM_MANAGERS_DEFINE_EXCEPTION(RCMSNotificationError)
GEM_MANAGERS_DEFINE_EXCEPTION(SOAPTransitionProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(NULLReadoutPointer)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(SoftwareProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(TransitionProblem)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(ValueError)
GEM_MANAGERS_DEFINE_EXCEPTION(SoftwareProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(TransitionProblem)
GEM_MANAGERS_DEFINE_EXCEPTION(ValueError)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(RPCMethodError)
GEM_MANAGERS_DEFINE_EXCEPTION(RPCMethodError)
GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(DeviceNameParseError)
GEM_MANAGERS_DEFINE_EXCEPTION(DeviceNameParseError)
// The gem::hardware::manager alarms.
#define GEM_HARDWARE_MANAGERS_DEFINE_ALARM(ALARM_NAME) GEM_HARDWARE_MANAGERS_DEFINE_EXCEPTION(ALARM_NAME)
// The gem::manager alarms.
#define GEM_MANAGERS_DEFINE_ALARM(ALARM_NAME) GEM_MANAGERS_DEFINE_EXCEPTION(ALARM_NAME)
GEM_HARDWARE_MANAGERS_DEFINE_ALARM(MonitoringFailureAlarm)
GEM_MANAGERS_DEFINE_ALARM(MonitoringFailureAlarm)
// FIXME: SHOULD I BE A MACRO OR A FUNCTION ELSEWHERE
// FIXME: SHOULD TRANSITION ERRORS FORCE FSM TO ERROR?
#define GEM_HARDWARE_TRANSITION_CATCH(MSG_BASE, EX_TYPE) \
#define GEM_MANAGERS_TRANSITION_CATCH(MSG_BASE, EX_TYPE) \
catch (EX_TYPE const& e) \
{ \
std::stringstream errmsg; \
......@@ -58,4 +58,4 @@ GEM_HARDWARE_MANAGERS_DEFINE_ALARM(MonitoringFailureAlarm)
XCEPT_RAISE(EX_TYPE, errmsg.str()); \
}
#endif // GEM_HARDWARE_MANAGERS_EXCEPTION_EXCEPTION_H
#endif // GEMMANAGERS_EXCEPTION_EXCEPTION_H
/// @file AMC13Manager.cpp
#include <gem/hardware/managers/AMC13Manager.h>
#include <gem/managers/AMC13Manager.h>
#include <gem/hardware/managers/AMC13ManagerWeb.h>
#include <gem/hardware/managers/exception/Exception.h>
#include <gem/managers/AMC13ManagerWeb.h>
#include <gem/managers/exception/Exception.h>
#include <gem/utils/exception/Exception.h>
#include <gem/utils/soap/GEMSOAPToolBox.h>
......@@ -12,9 +12,9 @@
#include <uhal/log/exception.hpp>
#include <uhal/log/log.hpp>
XDAQ_INSTANTIATOR_IMPL(gem::hardware::AMC13Manager);
XDAQ_INSTANTIATOR_IMPL(gem::managers::AMC13Manager);
gem::hardware::AMC13Manager::BGOInfo::BGOInfo()
gem::managers::AMC13Manager::BGOInfo::BGOInfo()
{
channel = -1; // want this to somehow automatically get the position in the struct
cmd = 0x0;
......@@ -24,7 +24,7 @@ gem::hardware::AMC13Manager::BGOInfo::BGOInfo()
isLong = false;
}
void gem::hardware::AMC13Manager::BGOInfo::registerFields(xdata::Bag<BGOInfo>* bgobag)
void gem::managers::AMC13Manager::BGOInfo::registerFields(xdata::Bag<BGOInfo>* bgobag)
{
bgobag->addField("BGOChannel", &channel);
bgobag->addField("BGOcmd", &cmd);
......@@ -34,7 +34,7 @@ void gem::hardware::AMC13Manager::BGOInfo::registerFields(xdata::Bag<BGOInfo>* b
bgobag->addField("BGOlong", &isLong);
}
gem::hardware::AMC13Manager::L1AInfo::L1AInfo()
gem::managers::AMC13Manager::L1AInfo::L1AInfo()
{
enableLocalL1A = false;
internalPeriodicPeriod = 1;
......@@ -46,7 +46,7 @@ gem::hardware::AMC13Manager::L1AInfo::L1AInfo()
enableLEMO = false;
}
void gem::hardware::AMC13Manager::L1AInfo::registerFields(xdata::Bag<L1AInfo>* l1Abag)
void gem::managers::AMC13Manager::L1AInfo::registerFields(xdata::Bag<L1AInfo>* l1Abag)
{
l1Abag->addField("EnableLocalL1A", &enableLocalL1A);
l1Abag->addField("InternalPeriodicPeriod", &internalPeriodicPeriod);
......@@ -58,7 +58,7 @@ void gem::hardware::AMC13Manager::L1AInfo::registerFields(xdata::Bag<L1AInfo>* l
l1Abag->addField("EnableLEMO", &enableLEMO);
}
gem::hardware::AMC13Manager::TTCInfo::TTCInfo()
gem::managers::AMC13Manager::TTCInfo::TTCInfo()
{
resyncCommand = 0x04;
resyncMask = 0x01;
......@@ -66,7 +66,7 @@ gem::hardware::AMC13Manager::TTCInfo::TTCInfo()
oc0Mask = 0x01;
}
void gem::hardware::AMC13Manager::TTCInfo::registerFields(xdata::Bag<TTCInfo>* ttcbag)
void gem::managers::AMC13Manager::TTCInfo::registerFields(xdata::Bag<TTCInfo>* ttcbag)
{
ttcbag->addField("RESYNC_CMD", &resyncCommand);
ttcbag->addField("RESYNC_MASK", &resyncMask);
......@@ -74,7 +74,7 @@ void gem::hardware::AMC13Manager::TTCInfo::registerFields(xdata::Bag<TTCInfo>* t
ttcbag->addField("OC0_MASK", &oc0Mask);
}
gem::hardware::AMC13Manager::AMC13Info::AMC13Info()
gem::managers::AMC13Manager::AMC13Info::AMC13Info()
{
connectionFile = "N/A";
cardName = "N/A";
......@@ -101,7 +101,7 @@ gem::hardware::AMC13Manager::AMC13Info::AMC13Info()
// localL1AMask;
}
void gem::hardware::AMC13Manager::AMC13Info::registerFields(xdata::Bag<AMC13Info>* bag)
void gem::managers::AMC13Manager::AMC13Info::registerFields(xdata::Bag<AMC13Info>* bag)
{
bag->addField("ConnectionFile", &connectionFile);
......@@ -129,7 +129,7 @@ void gem::hardware::AMC13Manager::AMC13Info::registerFields(xdata::Bag<AMC13Info
// bag->addField("LocalL1AMask", &localL1AMask);
}
gem::hardware::AMC13Manager::AMC13Manager(xdaq::ApplicationStub* stub)
gem::managers::AMC13Manager::AMC13Manager(xdaq::ApplicationStub* stub)
: gem::base::GEMFSMApplication(stub)
, m_amc13Lock(toolbox::BSem::FULL, true)
, p_timer(NULL)
......@@ -150,19 +150,19 @@ gem::hardware::AMC13Manager::AMC13Manager(xdaq::ApplicationStub* stub)
// initialize the AMC13Manager application objects
CMSGEMOS_DEBUG("AMC13Manager::connecting to the AMC13ManagerWeb interface");
p_gemWebInterface = new gem::hardware::AMC13ManagerWeb(this);
p_gemWebInterface = new gem::managers::AMC13ManagerWeb(this);
CMSGEMOS_DEBUG("AMC13Manager::done");
// CMSGEMOS_DEBUG("AMC13Manager::executing preInit for AMC13Manager");
// preInit();
// CMSGEMOS_DEBUG("AMC13Manager::done");
p_appDescriptor->setAttribute("icon", "/gemdaq/gemhardware/html/images/amc13/AMC13Manager.png");
p_appDescriptor->setAttribute("icon", "/gemdaq/gemmanagers/html/images/amc13/AMC13Manager.png");
xoap::bind(this, &gem::hardware::AMC13Manager::sendTriggerBurst, "sendtriggerburst", XDAQ_NS_URI);
xoap::bind(this, &gem::hardware::AMC13Manager::enableTriggers, "enableTriggers", XDAQ_NS_URI);
xoap::bind(this, &gem::hardware::AMC13Manager::disableTriggers, "disableTriggers", XDAQ_NS_URI);
xoap::bind(this, &gem::managers::AMC13Manager::sendTriggerBurst, "sendtriggerburst", XDAQ_NS_URI);
xoap::bind(this, &gem::managers::AMC13Manager::enableTriggers, "enableTriggers", XDAQ_NS_URI);
xoap::bind(this, &gem::managers::AMC13Manager::disableTriggers, "disableTriggers", XDAQ_NS_URI);
xoap::bind(this, &gem::hardware::AMC13Manager::restartAMC13Counts, "restartAMC13Counts", XDAQ_NS_URI);
xoap::bind(this, &gem::managers::AMC13Manager::restartAMC13Counts, "restartAMC13Counts", XDAQ_NS_URI);
// Create the timer polling the trigger counter
const std::string class_name = this->getApplicationDescriptor()->getClassName();
......@@ -176,13 +176,13 @@ gem::hardware::AMC13Manager::AMC13Manager(xdaq::ApplicationStub* stub)
m_updatedL1ACount = 0;
}
gem::hardware::AMC13Manager::~AMC13Manager()
gem::managers::AMC13Manager::~AMC13Manager()
{
CMSGEMOS_DEBUG("AMC13Manager::dtor called");
}
// This is the callback used for handling xdata:Event objects
void gem::hardware::AMC13Manager::actionPerformed(xdata::Event& event)
void gem::managers::AMC13Manager::actionPerformed(xdata::Event& event)
{
if (event.type() == "setDefaultValues" || event.type() == "urn:xdaq-event:setDefaultValues") {
CMSGEMOS_DEBUG("AMC13Manager::actionPerformed() setDefaultValues"
......@@ -244,28 +244,28 @@ void gem::hardware::AMC13Manager::actionPerformed(xdata::Event& event)
gem::base::GEMApplication::actionPerformed(event);
}
void gem::hardware::AMC13Manager::init()
void gem::managers::AMC13Manager::init()
{
}
gem::hardware::amc13_status_ptr gem::hardware::AMC13Manager::getHTMLStatus() const
gem::managers::amc13_status_ptr gem::managers::AMC13Manager::getHTMLStatus() const
{
gem::utils::LockGuard<gem::utils::Lock> guardedLock(m_amc13Lock);
return std::shared_ptr<::amc13::Status>(p_amc13->getStatus());
}
void gem::hardware::AMC13Manager::setDisplayLevel(xgi::Input* in, xgi::Output* out)
void gem::managers::AMC13Manager::setDisplayLevel(xgi::Input* in, xgi::Output* out)
{
dynamic_cast<AMC13ManagerWeb*>(p_gemWebInterface)->setDisplayLevel(in);
}
void gem::hardware::AMC13Manager::updateStatus(xgi::Input* in, xgi::Output* out)
void gem::managers::AMC13Manager::updateStatus(xgi::Input* in, xgi::Output* out)
{
dynamic_cast<AMC13ManagerWeb*>(p_gemWebInterface)->updateStatus(out);
}
//state transitions
void gem::hardware::AMC13Manager::initializeAction()
void gem::managers::AMC13Manager::initializeAction()
{
// hcal has a pre-init, what is the reason to not do everything in initialize?
std::string connection = "${GEM_ADDRESS_TABLE_PATH}/" + m_connectionFile;
......@@ -283,22 +283,22 @@ void gem::hardware::AMC13Manager::initializeAction()
std::stringstream msg;
msg << "AMC13Manager::AMC13::AMC13() failed, caught amc13::Exception: " << e.what();
CMSGEMOS_ERROR(msg.str());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, msg.str());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, msg.str());
} catch (uhal::exception::exception const& e) {
std::stringstream msg;
msg << "AMC13Manager::AMC13::AMC13() failed, caught uhal::exception: " << e.what();
CMSGEMOS_ERROR(msg.str());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, msg.str());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, msg.str());
} catch (std::exception const& e) {
std::stringstream msg;
msg << "AMC13Manager::AMC13::AMC13() failed, caught std::exception: " << e.what();
CMSGEMOS_ERROR(msg.str());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, msg.str());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, msg.str());
} catch (...) {
std::stringstream msg;
msg << "AMC13Manager::AMC13::AMC13() failed (unknown exception)";
CMSGEMOS_ERROR(msg.str());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, msg.str());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, msg.str());
}
CMSGEMOS_DEBUG("AMC13Manager::initializeAction finished with AMC13::AMC13()");
......@@ -321,10 +321,10 @@ void gem::hardware::AMC13Manager::initializeAction()
p_amc13->enableAllTTC();
} catch (uhal::exception::exception const& e) {
CMSGEMOS_ERROR("AMC13Manager::AMC13::AMC13() failed, caught uhal::exception " << e.what());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, std::string("Problem during preinit : ") + e.what());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, std::string("Problem during preinit : ") + e.what());
} catch (std::exception const& e) {
CMSGEMOS_ERROR("AMC13Manager::AMC13::AMC13() failed, caught std::exception " << e.what());
XCEPT_RAISE(gem::hardware::managers::exception::HardwareProblem, std::string("Problem during preinit : ") + e.what());
XCEPT_RAISE(gem::managers::exception::HardwareProblem, std::string("Problem during preinit : ") + e.what());
}
// equivalent to hcal init part
......@@ -394,7 +394,7 @@ void gem::hardware::AMC13Manager::initializeAction()
CMSGEMOS_INFO("AMC13Manager::initializeAction end");
}
void gem::hardware::AMC13Manager::configureAction()
void gem::managers::AMC13Manager::configureAction()
{
// Set the offset between the AMC13 BX counter and AMC BX counter
// Starts at 0 on the AMC13, and at 1 on the AMC
......@@ -441,7 +441,7 @@ void gem::hardware::AMC13Manager::configureAction()
CMSGEMOS_INFO("AMC13Manager::configureAction end");
}
xoap::MessageReference gem::hardware::AMC13Manager::restartAMC13Counts(xoap::MessageReference mns)
xoap::MessageReference gem::managers::AMC13Manager::restartAMC13Counts(xoap::MessageReference mns)
{
CMSGEMOS_DEBUG("AMC13Manager::Entering AMC13Manager::restartAMC13Counts()");
gem::utils::LockGuard<gem::utils::Lock> guardedLock(m_amc13Lock);
......@@ -474,7 +474,7 @@ xoap::MessageReference gem::hardware::AMC13Manager::restartAMC13Counts(xoap::Mes
"Expected scanType = 2 or 3, got " + std::to_string(m_scanInfo.bag.scanType.value_));
}
void gem::hardware::AMC13Manager::startAction()
void gem::managers::AMC13Manager::startAction()
{
CMSGEMOS_DEBUG("AMC13Manager::Entering AMC13Manager::startAction()");
// gem::base::GEMFSMApplication::enable();
......@@ -536,7 +536,7 @@ void gem::hardware::AMC13Manager::startAction()
CMSGEMOS_INFO("AMC13Manager::startAction end");
}
void gem::hardware::AMC13Manager::pauseAction()
void gem::managers::AMC13Manager::pauseAction()
{
// what does pause mean here?
// if local triggers are enabled, do we have a separate trigger application?
......@@ -571,7 +571,7 @@ void gem::hardware::AMC13Manager::pauseAction()
CMSGEMOS_INFO("AMC13Manager::pauseAction end");