Commit 0914808c authored by Fabio Ravera's avatar Fabio Ravera
Browse files

Merge branch 'v1.x-dev' into 'v1.x-dev'

Periodic merge request

See merge request !2
parents 99b9874f 751c20fa
......@@ -56,6 +56,7 @@ struct ChipEventData
struct EventData
{
std::time_t timestamp;
uint32_t nTRIGxEvent;
uint32_t l1aCounter;
uint32_t tdc;
uint32_t bxCounter;
......@@ -66,6 +67,7 @@ struct EventData
void serialize(Archive& ar, const unsigned int version)
{
ar& timestamp;
ar& nTRIGxEvent;
ar& l1aCounter;
ar& tdc;
ar& bxCounter;
......
......@@ -29,7 +29,7 @@ ENDIF(BUILD_nreader)
AUX_SOURCE_DIRECTORY( src library_sources )
AUX_SOURCE_DIRECTORY( plugins plugins_sources )
# Boost
# BOOST
string(ASCII 27 Esc)
set(Reset "${Esc}[m")
set(BoldRed "${Esc}[1;31m")
......@@ -42,7 +42,7 @@ IF (Boost_FOUND)
ELSE (Boost_FOUND)
message("${BoldRed}=== I didn't find any BOOST. BOOST is needed to run with the InnerTracker DAQ ===${Reset}")
list(REMOVE_ITEM plugins_sources plugins/CMSITConverterPlugin.cc)
ENDIF (BUILD_nreader)
ENDIF (Boost_FOUND)
option(USE_TINYXML "Compiling main library using TinyXML" OFF)
if (USE_TINYXML OR BUILD_palpidefs)
......
......@@ -78,12 +78,16 @@ static const int MAXTRIGIDCNT = 32767;
// # slopeVCal2Electrons_hybridId0_chipId0 = 11.67 #
// # interceptVCal2Electrons_hybridId0_chipId0 = 64 #
// # #
// # fileName_hybridId1_chipId0 = “Run000001_Gain.root" #
// # slopeVCal2Electrons_hybridId1_chipId0 = 11.67 #
// # interceptVCal2Electrons_hybridId1_chipId0 = 64 #
// # [sensor.selection] #
// # charge_hybridId0_chipId1 = 1500 #
// # triggerIdLow_hybridId0_chipId1 = -1 #
// # triggerIdHigh_hybridId0_chipId1 = -1 #
// # #
// # [converter.settings] #
// # exitIfOutOfSync = true #
// #####################################################################
// # This information is also stored in the data, therefore this cfg #
// # is intended just to override the data, if needed #
// # To be placed in the Corryvreckan output directory or in the EUDAQ #
// # bin directory #
// #####################################################################
static const char* CFG_FILE_NAME = "CMSIT.cfg";
......@@ -324,9 +328,12 @@ class CMSITConverterPlugin : public DataConverterPlugin
// #######################################
if(theEvent.tluTriggerId != *theTLUtriggerId_previous + 1)
{
std::cout << "[EUDAQ::CMSITConverterPlugin::GetStandardSubEvent] WARNING: possible loss of synchronization, current trigger ID " << theEvent.tluTriggerId
<< ", previus trigger ID " << *theTLUtriggerId_previous << std::endl;
if(exitIfOutOfSync == true) exit(EXIT_FAILURE);
if(exitIfOutOfSync == true)
{
std::cout << "[EUDAQ::CMSITConverterPlugin::GetStandardSubEvent] WARNING: possible loss of synchronization, current trigger ID " << theEvent.tluTriggerId
<< ", previus trigger ID " << *theTLUtriggerId_previous << std::endl;
exit(EXIT_FAILURE);
}
}
*const_cast<int*>(theTLUtriggerId_previous) = (theEvent.tluTriggerId == MAXTRIGIDCNT ? -1 : theEvent.tluTriggerId);
......
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