Commit 4bc29d1d authored by Mauro Dinardo's avatar Mauro Dinardo
Browse files

Removed unused parameter from SystemController:GetEvents

parent bc4d00b9
......@@ -25,7 +25,7 @@ void SCurveHistograms::book(TFile* theOutputFile, const DetectorContainer& theDe
stopValue = this->findValueInSettings(settingsMap, "VCalHstop");
offset = this->findValueInSettings(settingsMap, "VCalMED");
auto hOcc2D = CanvasContainer<TH2F>("SCurves", "SCurves", nSteps, startValue - offset, stopValue - offset, 2*nEvents + 1, 0, 2 + 1. / nEvents);
auto hOcc2D = CanvasContainer<TH2F>("SCurves", "SCurves", nSteps, startValue - offset, stopValue - offset, 2 * nEvents + 1, 0, 2 + 1. / nEvents);
bookImplementer(theOutputFile, theDetectorStructure, Occupancy2D, hOcc2D, "#DeltaVCal", "Efficiency");
auto hErrorReadOut2D = CanvasContainer<TH2F>("ReadoutErrors", "Readout Errors", RD53::nCols, 0, RD53::nCols, RD53::nRows, 0, RD53::nRows);
......
......@@ -19,17 +19,15 @@ void ThrEqualizationHistograms::book(TFile* theOutputFile, const DetectorContain
// #######################
// # Retrieve parameters #
// #######################
nEvents = this->findValueInSettings(settingsMap, "nEvents");
nEvents = this->findValueInSettings(settingsMap, "nEvents");
size_t TDACsize = RD53Shared::setBits(RD53Constants::NBIT_TDAC) + 1;
size_t colStart = this->findValueInSettings(settingsMap ,"COLstart");
size_t colStart = this->findValueInSettings(settingsMap, "COLstart");
size_t colStop = this->findValueInSettings(settingsMap, "COLstop");
frontEnd = RD53::getMajorityFE(colStart, colStop);
frontEnd = RD53::getMajorityFE(colStart, colStop);
if(frontEnd == &RD53::DIFF) TDACsize *= 2;
auto hThrEqualization = CanvasContainer<TH1F>("ThrEqualization", "ThrEqualization", nEvents + 1, 0, 1 + 1. / nEvents);
bookImplementer(theOutputFile, theDetectorStructure, ThrEqualization, hThrEqualization, "Efficiency", "Entries");
......
......@@ -22,7 +22,7 @@ bool D19clpGBTInterface::ConfigureChip(Ph2_HwDescription::Chip* pChip, bool pVer
{
LOG(INFO) << BOLDBLUE << "Configuring lpGBT" << RESET;
setBoard(pChip->getBeBoardId());
//Load register map from configuration file
// Load register map from configuration file
ChipRegMap clpGBTRegMap = pChip->getRegMap();
for(const auto& cRegItem: clpGBTRegMap)
{
......
......@@ -524,7 +524,6 @@ void SystemController::DecodeData(const BeBoard* pBoard, const std::vector<uint3
{
for(auto& pevt: fEventList) delete pevt;
fEventList.clear();
fCurrentEvent = 0;
if(pNevents == 0) { LOG(INFO) << BOLDRED << "Asking to decode 0 events. . something might not be right here!!!" << RESET; }
else
......
......@@ -229,24 +229,7 @@ class SystemController
const Ph2_HwDescription::BeBoard* getBoard(int index) const { return (index < static_cast<int>(fDetectorContainer->size()) ? fDetectorContainer->at(index) : nullptr); }
/*!
* \brief Get next event from data buffer
* \param pBoard
* \return Next event
*/
const Ph2_HwInterface::Event* GetNextEvent(const Ph2_HwDescription::BeBoard* pBoard)
{
if(fFuture.valid() == true) fFuture.get();
return ((fCurrentEvent >= fEventList.size()) ? nullptr : fEventList.at(fCurrentEvent++));
}
const Ph2_HwInterface::Event* GetEvent(const Ph2_HwDescription::BeBoard* pBoard, unsigned int i)
{
if(fFuture.valid() == true) fFuture.get();
return ((i >= fEventList.size()) ? nullptr : fEventList.at(i));
}
const std::vector<Ph2_HwInterface::Event*>& GetEvents(const Ph2_HwDescription::BeBoard* pBoard)
const std::vector<Ph2_HwInterface::Event*>& GetEvents()
{
if(fFuture.valid() == true) fFuture.get();
return fEventList;
......@@ -261,9 +244,7 @@ class SystemController
std::vector<Ph2_HwInterface::Event*> fEventList;
std::future<void> fFuture;
uint32_t fCurrentEvent;
uint32_t fEventSize;
uint32_t fNevents;
uint32_t fNCbc;
FileParser fParser;
};
......
......@@ -39,9 +39,9 @@
// # Default values #
// ##################
#define RUNNUMBER 0
#define SETBATCH 0 // Set batch mode when running supervisor
#define SETBATCH 0 // Set batch mode when running supervisor
#define FILERUNNUMBER "./RunNumber.txt"
#define BASEDIR "PH2ACF_BASE_DIR"
#define BASEDIR "PH2ACF_BASE_DIR"
#define ARBITRARYDELAY 2e6 // [us]
INITIALIZE_EASYLOGGINGPP
......@@ -88,7 +88,8 @@ void readBinaryData(const std::string& binaryFile, SystemController& mySysCntr,
LOG(INFO) << GREEN << "Corrupted events: " << BOLDYELLOW << std::setprecision(3) << errors << " (" << 1. * errors / decodedEvents.size() * 100. << "%)" << std::setprecision(-1) << RESET;
int avgEventSize = data.size() / decodedEvents.size();
LOG(INFO) << GREEN << "Average event size is " << BOLDYELLOW << avgEventSize * wordDataSize << RESET << GREEN << " bits over " << BOLDYELLOW << decodedEvents.size() << RESET << GREEN << " events" << RESET;
LOG(INFO) << GREEN << "Average event size is " << BOLDYELLOW << avgEventSize * wordDataSize << RESET << GREEN << " bits over " << BOLDYELLOW << decodedEvents.size() << RESET << GREEN << " events"
<< RESET;
mySysCntr.closeFileHandler();
}
......
......@@ -208,9 +208,9 @@ int main(int argc, char* argv[])
std::cout<<"counts"<<cpix<<" "<<(cRP2*256) + cRP1<<std::endl;
}*/
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
// const std::vector<Event*> &eventVector = cTool.GetEvents(pBoard);
// const std::vector<Event*> &eventVector = cTool.GetEvents();
int nev = 0;
int nevtot = 0;
int nstub = 0;
......
......@@ -80,7 +80,7 @@ int main(int argc, char* argv[])
cTool.fReadoutChipInterface->WriteChipReg(theSSA, "Bias_THDAC", thd);
}
cTool.ReadNEvents(pBoard, 500);
const std::vector<Event*>& eventVector = cTool.GetEvents(pBoard);
const std::vector<Event*>& eventVector = cTool.GetEvents();
for(auto& event: eventVector) // for on events - begin
{
LOG(INFO) << BOLDRED << "L1N: " << static_cast<D19cSSAEvent*>(event)->GetL1Number() << RESET;
......
......@@ -371,7 +371,7 @@ int main(int argc, char* argv[])
else
cTool.ReadNEvents(pBoard, cAcqSize);
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
for(auto& ev: events)
{
......
......@@ -128,7 +128,7 @@ int main(int argc, char* argv[])
dynamic_cast<D19cFWInterface*>(cCicAligner.fBeBoardInterface->getFirmwareInterface())->ConfigureTriggerFSM(0, 75);
// read n events from the board
cCicAligner.ReadNEvents(pBoard, 10);
const std::vector<Event*>& events = cCicAligner.GetEvents(pBoard);
const std::vector<Event*>& events = cCicAligner.GetEvents();
LOG(INFO) << BOLDBLUE << "Read back " << +events.size() << " events from FC7." << RESET;
LOG(INFO) << BOLDBLUE << "Vcth = " << +cVcth << " DAC units." << RESET;
int cNevents = 0;
......
......@@ -276,7 +276,7 @@ int main(int argc, char* argv[])
}
}
cExtra.ReadNEvents(theBoard, 1);
const std::vector<Event*>& cEvents = cExtra.GetEvents(theBoard);
const std::vector<Event*>& cEvents = cExtra.GetEvents();
uint32_t cN = 0;
for(auto& cEvent: cEvents)
{
......
......@@ -138,7 +138,7 @@ int main(int argc, char** argv)
cTool.setSystemTestPulse(cTestPulseAmplitude, i, true, false);
cTool.ReadNEvents(pBoard, 1);
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
for(auto& ev: events)
{
LOG(INFO) << ">>> Event #" << cN++;
......@@ -175,7 +175,7 @@ int main(int argc, char** argv)
while(cN < cNEventsToCollect)
{
cTool.ReadData(pBoard);
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
for(auto& ev: events)
{
count++;
......@@ -294,7 +294,7 @@ int main(int argc, char** argv)
else
{
cTool.ReadNEvents(pBoard, cNEventsToCollect);
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
for(auto& ev: events)
{
for(auto cOpticalGroup: *pBoard)
......@@ -343,7 +343,7 @@ int main(int argc, char** argv)
// if nothing else
/* uint32_t cNEventsToCollect = ( cmd.foundOption ( "events" ) ) ? convertAnyInt ( cmd.optionValue (
"events" ).c_str() ) : 10000; cTool.ReadNEvents( pBoard, cNEventsToCollect ); const std::vector<Event*>&
events = cTool.GetEvents ( pBoard ); int cNevents=0; for( auto& cEvent : events )
events = cTool.GetEvents(); int cNevents=0; for( auto& cEvent : events )
{
LOG (INFO) << ">>> Event #" << cNevents ;
LOG (INFO) << *cEvent;
......
......@@ -180,7 +180,7 @@ int main(int argc, char* argv[])
cSystemController.readFile(cReadVec, 10 * fPlaybackEventSize32);
size_t cCalcEvents = cReadVec.size() / fPlaybackEventSize32;
cSystemController.DecodeData(pBoard, cReadVec, cCalcEvents, pBoard->getBoardType());
pEvents = &cSystemController.GetEvents(pBoard);
pEvents = &cSystemController.GetEvents();
}
else
{
......@@ -188,7 +188,7 @@ int main(int argc, char* argv[])
if(cN + cPacketSize > pEventsperVcth) cSystemController.fBeBoardInterface->Stop(pBoard);
pEvents = &cSystemController.GetEvents(pBoard);
pEvents = &cSystemController.GetEvents();
}
for(auto& ev: *pEvents)
......
#include <cstdlib>
#include <inttypes.h>
#include <string>
#include <vector>
#include <inttypes.h>
#include "../HWDescription/BeBoard.h"
#include "../HWDescription/Chip.h"
......@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
exit(1);
}
el::Configurations conf(std::string(baseDirChar_p)+"/settings/logger.conf");
el::Configurations conf(std::string(baseDirChar_p) + "/settings/logger.conf");
el::Loggers::reconfigureAllLoggers(conf);
SystemController cSystemController;
......@@ -120,8 +120,8 @@ int main(int argc, char* argv[])
cSystemController.InitializeHw(cHWFile, cStr);
BeBoard* pBoard = cSystemController.fDetectorContainer->at(0);
std::vector<std::string> lstNames = cSystemController.fBeBoardInterface->getFpgaConfigList(pBoard);
std::string cFWFile;
std::string strImage("1");
std::string cFWFile;
std::string strImage("1");
if(cmd.foundOption("list"))
{
......
......@@ -169,7 +169,7 @@ int main(int argc, char* argv[])
if(cN + cPacketSize >= pEventsperVcth) cTool.fBeBoardInterface->Stop(pBoard);
const std::vector<Event*>& events = cTool.GetEvents(pBoard);
const std::vector<Event*>& events = cTool.GetEvents();
std::vector<DQMEvent*> cDQMEvents;
for(auto& ev: events)
......
......@@ -68,7 +68,8 @@ void readBinaryData(const std::string& binaryFile, SystemController& mySysCntr,
LOG(INFO) << GREEN << "Corrupted events: " << BOLDYELLOW << std::setprecision(3) << errors << " (" << 1. * errors / decodedEvents.size() * 100. << "%)" << std::setprecision(-1) << RESET;
int avgEventSize = data.size() / decodedEvents.size();
LOG(INFO) << GREEN << "Average event size is " << BOLDYELLOW << avgEventSize * wordDataSize << RESET << GREEN << " bits over " << BOLDYELLOW << decodedEvents.size() << RESET << GREEN << " events" << RESET;
LOG(INFO) << GREEN << "Average event size is " << BOLDYELLOW << avgEventSize * wordDataSize << RESET << GREEN << " bits over " << BOLDYELLOW << decodedEvents.size() << RESET << GREEN << " events"
<< RESET;
mySysCntr.closeFileHandler();
}
......@@ -81,7 +82,7 @@ int main(int argc, char** argv)
const bool doReset = false;
const bool doReadBinary = false;
SystemController mySysCntr;
SystemController mySysCntr;
std::stringstream outp;
mySysCntr.InitializeHw(configFile, outp, true, false);
mySysCntr.InitializeSettings(configFile, outp);
......
......@@ -237,7 +237,7 @@ void CMTester::ScanNoiseChannels()
//{
BeBoard* theBoard = static_cast<BeBoard*>(pBoard);
ReadNEvents(theBoard, cTotalEvents);
const std::vector<Event*>& events = GetEvents(theBoard);
const std::vector<Event*>& events = GetEvents();
// Loop over Events from this Acquisition
for(auto& cEvent: events)
......@@ -340,7 +340,7 @@ void CMTester::TakeData()
// Run( theBoard, cNthAcq );
// ReadData (theBoard);
ReadNEvents(theBoard, fNevents);
const std::vector<Event*>& events = GetEvents(theBoard);
const std::vector<Event*>& events = GetEvents();
// Loop over Events from this Acquisition
......
......@@ -40,7 +40,7 @@ void CalibrationExample::runCalibrationExample(void)
ReadNEvents(theBeBoard, fEventsPerPoint);
// Get the event vector (as it was in the past)
const std::vector<Event*>& eventVector = GetEvents(theBeBoard);
const std::vector<Event*>& eventVector = GetEvents();
for(auto& event: eventVector) // for on events - begin
{
......
......@@ -281,7 +281,7 @@ void DataChecker::matchEvents(BeBoard* pBoard, std::vector<uint8_t> pChipIds, st
auto& cThisHitCheckContainer = fHitCheckContainer.at(pBoard->getIndex());
auto& cThisStubCheckContainer = fStubCheckContainer.at(pBoard->getIndex());
const std::vector<Event*>& cEvents = this->GetEvents(pBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(DEBUG) << BOLDMAGENTA << "Read back " << +cEvents.size() << " events from board." << RESET;
for(auto cOpticalGroup: *pBoard)
......@@ -483,7 +483,7 @@ void DataChecker::AsyncTest()
BeBoard* theBoard = static_cast<BeBoard*>(cBoard);
LOG(INFO) << BOLDRED << "Reading counters .. " << RESET;
this->ReadNEvents(theBoard, this->findValueInSettings("Nevents"));
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
for(auto cOpticalGroup: *cBoard)
{
for(auto cHybrid: *cOpticalGroup)
......@@ -500,7 +500,7 @@ void DataChecker::AsyncTest()
}
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadNEvents" << RESET;
}
// const std::vector<Event*>& cEvents = this->GetEvents ( theBoard );
// const std::vector<Event*>& cEvents = this->GetEvents();
}
LOG(INFO) << BOLDBLUE << "Done!" << RESET;
}
......@@ -538,7 +538,7 @@ void DataChecker::ReadDataTest()
// }while( std::cin.get()!='\n');
LOG(INFO) << BOLDRED << "Reading data .. " << RESET;
this->ReadData(theBoard, true);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
uint32_t cN = 0;
......@@ -590,7 +590,7 @@ void DataChecker::WriteSlinkTest(std::string pDAQFileName)
BeBoard* cBeBoard = static_cast<BeBoard*>(cBoard);
this->ReadNEvents(cBeBoard, cNevents);
const std::vector<Event*>& cEvents = this->GetEvents(cBeBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
uint32_t cN = 0;
for(auto& cEvent: cEvents)
......@@ -627,7 +627,7 @@ void DataChecker::CollectEvents()
{
int cEventsToRead = (cBurst == (cNBursts - 1)) ? (cNevents % cMaxNevents) : cMaxNevents;
this->ReadNEvents(cBeBoard, cEventsToRead);
const std::vector<Event*>& cEvents = this->GetEvents(cBeBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
cNrecordedEvents += cEvents.size();
}
......@@ -657,7 +657,7 @@ void DataChecker::ReadNeventsTest()
}
BeBoard* cBeBoard = static_cast<BeBoard*>(cBoard);
this->ReadNEvents(cBeBoard, 1);
const std::vector<Event*>& cEvents = this->GetEvents(cBeBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
uint32_t cN = 0;
......@@ -873,7 +873,7 @@ void DataChecker::TestPulse(std::vector<uint8_t> pChipIds)
fBeBoardInterface->Stop(theBoard);
// this->ReadNEvents ( theBoard , cEventsPerPoint);
this->ReadData(theBoard, true);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
// matching
for(auto cOpticalGroup: *cBoard)
{
......@@ -1029,7 +1029,7 @@ void DataChecker::TestPulse(std::vector<uint8_t> pChipIds)
// //if( cResync)
// // fBeBoardInterface->ChipReSync ( cBoard );
// this->ReadNEvents ( cBoard , cEventsPerPoint);
// const std::vector<Event*>& cEvents = this->GetEvents ( cBoard );
// const std::vector<Event*>& cEvents = this->GetEvents();
// // matching
// for (auto& cHybrid : cBoard->fHybridVector)
// {
......@@ -1215,7 +1215,7 @@ void DataChecker::TestPulse(std::vector<uint8_t> pChipIds)
// // if( cResync)
// // fBeBoardInterface->ChipReSync ( cBoard );
// // this->ReadNEvents ( cBoard , cEventsPerPoint);
// // const std::vector<Event*>& cEvents = this->GetEvents ( cBoard );
// // const std::vector<Event*>& cEvents = this->GetEvents();
// // // matching
// // for (auto& cHybrid : cBoard->fHybridVector)
// // {
......@@ -1851,7 +1851,7 @@ void DataChecker::StubCheck(std::vector<uint8_t> pChipIds)
LOG(INFO) << BOLDBLUE << "\t..L1A latency set to " << +cDelay << " stub latency set to " << +cStubDelay << " so delay is " << +(cDelay - cStubDelay) << RESET;
this->ReadNEvents(cBeBoard, 5);
const std::vector<Event*>& cEventsWithStubs = this->GetEvents(cBeBoard);
const std::vector<Event*>& cEventsWithStubs = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEventsWithStubs.size() << " events read back from FC7 with ReadData" << RESET;
for(auto& cEvent: cEventsWithStubs)
{
......@@ -1960,7 +1960,7 @@ void DataChecker::StubCheckWNoise(std::vector<uint8_t> pChipIds)
LOG(INFO) << BOLDBLUE << "Stub latency set to " << +cStubDelay << RESET;
this->ReadNEvents(cBeBoard, 5);
const std::vector<Event*>& cEventsWithStubs = this->GetEvents(cBeBoard);
const std::vector<Event*>& cEventsWithStubs = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEventsWithStubs.size() << " events read back from FC7 with ReadData" << RESET;
for(auto& cEvent: cEventsWithStubs)
{
......@@ -2144,7 +2144,7 @@ void DataChecker::HitCheck2S(BeBoard* pBoard)
// read events
this->ReadNEvents(pBoard, cEventsPerPoint);
const std::vector<Event*>& cEvents = this->GetEvents(pBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(DEBUG) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
// check for matches
for(auto cOpticalGroup: *pBoard)
......@@ -2315,7 +2315,7 @@ void DataChecker::ClusterCheck(std::vector<uint8_t> pChannels)
fReadoutChipInterface->maskChannelsGroup(cChip, &fCBCMask);
}
this->ReadNEvents(cBoard, cNevents);
const std::vector<Event*>& cEvents = this->GetEvents(cBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
for(auto cChip: *cHybrid)
{
......
......@@ -431,7 +431,7 @@ void ExtraChecks::Evaluate(int pSigma, uint16_t pTriggerRate, bool pDisableStubs
{
// fBeBoardInterface->ChipReSync ( cBoard );
this->ReadNEvents(theBoard, cNevents);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
if(cIteration == 0 && cStepCount % 10 == 0)
{ LOG(INFO) << BOLDBLUE << "Threshold set to " << cVcth << "...\tIteration " << +cIteration << " : " << +cEvents.size() << " events read back from fc7." << RESET; }
......@@ -618,7 +618,7 @@ void ExtraChecks::OccupancyCheck(uint16_t pTriggerRate, bool pDisableStubs)
{
LOG(INFO) << BOLDBLUE << "Iteration : " << +cIteration << RESET;
this->ReadNEvents(theBoard, cNevents);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
for(auto cOpticalGroup: *cBoard)
{
for(auto cFe: *cOpticalGroup)
......@@ -684,7 +684,7 @@ void ExtraChecks::ExternalTriggers(uint16_t pNconsecutive, const std::string& pS
LOG(INFO) << BOLDBLUE << "Stopping triggers..." << RESET;
this->ReadData(theBoard, true);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
for(auto cOpticalGroup: *cBoard)
{
......@@ -749,7 +749,7 @@ void ExtraChecks::ConsecutiveTriggers(uint8_t pNconsecutive)
// fBeBoardInterface->Stop(theBoard);
// this->ReadData( theBoard , true);
// this->ReadNEvents ( theBoard , cNevents );
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDBLUE << +cEvents.size() << " events read back from FC7 with ReadData" << RESET;
for(auto cOpticalGroup: *cBoard)
{
......@@ -1059,7 +1059,7 @@ void ExtraChecks::DataCheckTP(std::vector<uint8_t> pChipIds, uint8_t pTPamplitud
// fBeBoardInterface->ChipReSync ( theBoard );
this->ReadNEvents(theBoard, cEventsPerAttempt);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
for(auto cOpticalGroup: *cBoard)
{
for(auto cFe: *cOpticalGroup)
......@@ -1363,7 +1363,7 @@ void ExtraChecks::QuickStubCheck(std::vector<uint8_t> pChipIds, uint16_t pTrigge
// why do I need this?
// this->setSameDacBeBoard(theBoard, "TriggerLatency", cDelay);
this->ReadNEvents(theBoard, cEventsPerPoint);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
for(auto cOpticalGroup: *cBoard)
{
for(auto cFe: *cOpticalGroup)
......@@ -1533,7 +1533,7 @@ void ExtraChecks::DataCheck(std::vector<uint8_t> pChipIds, uint16_t pTriggerRate
}
// read N events
this->ReadNEvents(theBoard, cEventsPerPoint); //*(1+cTriggerMultiplicity) );
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
LOG(INFO) << BOLDMAGENTA << "Read back " << +cEvents.size() << " events from board." << RESET;
for(auto cEvent: cEvents)
{
......@@ -1783,7 +1783,7 @@ void ExtraChecks::StubCheck(uint8_t pChipId, bool pUseNoise, uint8_t pTestPulseA
// set DAC .. read events
this->setSameDacBeBoard(theBoard, "VCth", cVcth);
this->ReadNEvents(theBoard, cEventsPerAttempt);
// const std::vector<Event*>& cEvents = this->GetEvents ( theBoard );
// const std::vector<Event*>& cEvents = this->GetEvents();
/*for (auto& cFe : cBoard->fModuleVector)
{
for (auto& cChip : cFe->fReadoutChipVector)
......@@ -1965,7 +1965,7 @@ void ExtraChecks::FindShorts(uint16_t pThreshold, uint16_t pTPamplitude)
std::bitset<NCHANNELS> cBitset = std::bitset<NCHANNELS>(static_cast<const ChannelGroup<NCHANNELS>*>(cGroup)->getBitset());
LOG(INFO) << "Injecting charge into front-end object using test capacitor " << +cTestGroup << " : L1A latency set to " << +cDelay << RESET;
this->ReadNEvents(theBoard, cEventsPerAttempt);
const std::vector<Event*>& cEvents = this->GetEvents(theBoard);
const std::vector<Event*>& cEvents = this->GetEvents();
for(auto cOpticalGroup: *cBoard)
{
auto cOpticalGroupShorts = cThisShortsContainer->at(cOpticalGroup->getIndex());
......
Supports Markdown
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