Commit 818e9e0b authored by Georg Auzinger's avatar Georg Auzinger
Browse files

fixed bug in Event::DataHexString() and changed Cbc class so that execution...

fixed bug in Event::DataHexString() and changed Cbc class so that execution terminates if Cbc settings file does not exist
parent 3ef1ad2b
......@@ -84,7 +84,10 @@ namespace Ph2_HwDescription {
file.close();
}
else
LOG (ERROR) << "The CBC Settings File " << filename << " could not be opened!" ;
{
LOG (ERROR) << "The CBC Settings File " << filename << " does not exist!" ;
exit (1);
}
}
......
......@@ -306,6 +306,8 @@ namespace Ph2_HwInterface {
{
std::stringbuf tmp;
std::ostream os ( &tmp );
std::ios oldState (nullptr);
oldState.copyfmt (os);
os << std::hex << std::setfill ('0');
//get the CBC event for pFeId and pCbcId into vector<32bit> cbcData
......@@ -320,7 +322,9 @@ namespace Ph2_HwInterface {
os << std::setw (8) << cbcData.at (i);
//the last word with only 8 bits
os << std::setw (2) << (cbcData.at (8) & 0xFF000000);
os << std::setw (2) << ( (cbcData.at (8) & 0xFF000000) >> 24);
os.copyfmt (oldState);
//uint32_t cFirstByteP = OFFSET_CBCDATA / 8;
......
......@@ -13,13 +13,14 @@
TO_STANDARD_OUTPUT = true
ENABLED = true ## We will set it to false after development completed
* WARNING:
ENABLED = true
FILENAME = "logs/Ph2_ACF_warn.log"
TO_STANDARD_OUTPUT = true
* VERBOSE:
FORMAT = "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
## Error logs
* ERROR:
ENABLED = false
ENABLED = true
FILENAME = "logs/Ph2_ACF_err.log"
TO_STANDARD_OUTPUT = true
* FATAL:
......
......@@ -18,10 +18,10 @@ export BOOST_INCLUDE=/opt/cactus/include
export BASE_DIR=$(pwd)
#ANTENNA
export ANTENNALIB=CMSPh2_AntennaDriver/lib
export ANTENNALIB=$BASE_DIR/CMSPh2_AntennaDriver/lib
#HMP4040
export USBINSTLIB=../Ph2_USBInstDriver/lib
export USBINSTLIB=$BASE_DIR/../Ph2_USBInstDriver/lib
export PATH=$BASE_DIR/bin:$PATH
export LD_LIBRARY_PATH=$BASE_DIR/$USBINSTLIB:$BASE_DIR/$ANTENNALIB:$BASE_DIR/RootWeb/lib:/opt/cactus/lib:$BASE_DIR/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=$USBINSTLIB:$ANTENNALIB:$BASE_DIR/RootWeb/lib:/opt/cactus/lib:$BASE_DIR/lib:${LD_LIBRARY_PATH}
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