Commit a552f4dc 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
parents 91ecd0ea 818e9e0b
...@@ -84,7 +84,10 @@ namespace Ph2_HwDescription { ...@@ -84,7 +84,10 @@ namespace Ph2_HwDescription {
file.close(); file.close();
} }
else 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 { ...@@ -306,6 +306,8 @@ namespace Ph2_HwInterface {
{ {
std::stringbuf tmp; std::stringbuf tmp;
std::ostream os ( &tmp ); std::ostream os ( &tmp );
std::ios oldState (nullptr);
oldState.copyfmt (os);
os << std::hex << std::setfill ('0'); os << std::hex << std::setfill ('0');
//get the CBC event for pFeId and pCbcId into vector<32bit> cbcData //get the CBC event for pFeId and pCbcId into vector<32bit> cbcData
...@@ -320,7 +322,9 @@ namespace Ph2_HwInterface { ...@@ -320,7 +322,9 @@ namespace Ph2_HwInterface {
os << std::setw (8) << cbcData.at (i); os << std::setw (8) << cbcData.at (i);
//the last word with only 8 bits //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; //uint32_t cFirstByteP = OFFSET_CBCDATA / 8;
......
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
TO_STANDARD_OUTPUT = true TO_STANDARD_OUTPUT = true
ENABLED = true ## We will set it to false after development completed ENABLED = true ## We will set it to false after development completed
* WARNING: * WARNING:
ENABLED = true
FILENAME = "logs/Ph2_ACF_warn.log" FILENAME = "logs/Ph2_ACF_warn.log"
TO_STANDARD_OUTPUT = true TO_STANDARD_OUTPUT = true
* VERBOSE: * VERBOSE:
FORMAT = "%datetime{%d/%M/%y} | %level-%vlevel | %msg" FORMAT = "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
## Error logs ## Error logs
* ERROR: * ERROR:
ENABLED = false ENABLED = true
FILENAME = "logs/Ph2_ACF_err.log" FILENAME = "logs/Ph2_ACF_err.log"
TO_STANDARD_OUTPUT = true TO_STANDARD_OUTPUT = true
* FATAL: * FATAL:
......
...@@ -20,10 +20,10 @@ export BOOST_INCLUDE=/opt/cactus/include ...@@ -20,10 +20,10 @@ export BOOST_INCLUDE=/opt/cactus/include
export BASE_DIR=$(pwd) export BASE_DIR=$(pwd)
#ANTENNA #ANTENNA
export ANTENNALIB=CMSPh2_AntennaDriver/lib export ANTENNALIB=$BASE_DIR/CMSPh2_AntennaDriver/lib
#HMP4040 #HMP4040
export USBINSTLIB=../Ph2_USBInstDriver/lib export USBINSTLIB=$BASE_DIR/../Ph2_USBInstDriver/lib
export PATH=$BASE_DIR/bin:$PATH 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