Commit 0813edb7 authored by stezow's avatar stezow
Browse files

gasp now optionnal by default and some bugs corrected for online compilation

git-svn-id: svn://gal-serv.lnl.infn.it/agata/trunk/narval_emulator@1177 170316e4-aea8-4b27-aad4-0380ec0519c9
parent 14537be8
......@@ -173,7 +173,7 @@ const int defTriggerSample = 10; // 60-10=50 samples passed to the PSA
//#define GLF_ROOTTREE // enable the root tree in this actor (ENABLED IN THE MAKEFILE)
//#define GLF_WRITE_TRACKED // enable writing the tracked gammas into the Oft_TrackedEnergies ascii file
#define GLF_WRITE_GSORT // enable writing input and tracked data in gasp format
//#define GLF_WRITE_GSORT // enable writing input and tracked data in gasp format
#define GLF_WRITE_HITS_MGT // enable writing the input hits in mgt format
#define GLF_MULTIHIST // enable MultiHist spectra
//#define GLF_FromGRU // enable GRU/ViGRU
......
......@@ -61,11 +61,11 @@ public:
int pollRet = poll(pollArray, vFA.size(), 500); // timeout half a second
if(pollRet == 0) {
//std::cout << "\npollReader::ReadAvailableData-" << which << " timeout " << std::endl; // poll interrupted (by ctrl-c...) ??
return EvAgain;
return kEvAgain;
}
else if(pollRet < 0) {
std::cout << "\npollReader::ReadAvailableData-" << which << " error in poll: " << strerror(errno) << std::endl; // poll interrupted (by ctrl-c...) ??
return EvFinish;
return kEvFinish;
}
bool whichHasData = false;
......@@ -78,7 +78,7 @@ public:
whichHasData = true;
hasData++;
int rval = vFA[nf]->ReadNextBuffer(which);
if(rval == EvNormal)
if(rval == kEvNormal)
gotData++;
}
}
......@@ -87,10 +87,10 @@ public:
}
if(!whichHasData) {
//DEBUG_LINE << " EvAgain" << std::endl;
return EvAgain;
return kEvAgain;
}
//DEBUG_LINE << " EvNormal" << std::endl;
return EvNormal;
return kEvNormal;
}
......
......@@ -10,6 +10,8 @@
#include "narval/NarvalCollector.h"
#endif
using namespace ADF;
extern "C" {
void process_config (const char *directory_path, UInt_t *error_code);
//! In here your new producer has to be added
......
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