Commit e7e3c3bb authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Remove obsolete parameter copies - only alignment left!

parent bf31d3d3
......@@ -9,8 +9,6 @@ ATLASpixEventLoader::ATLASpixEventLoader(Configuration config, std::vector<Detec
void ATLASpixEventLoader::initialise(Parameters* par) {
parameters = par;
// File structure is RunX/ATLASpix/data.dat
// Take input directory from global parameters
......
......@@ -16,8 +16,6 @@ BasicTracking::BasicTracking(Configuration config, std::vector<Detector*> detect
void BasicTracking::initialise(Parameters* par) {
parameters = par;
// Set up histograms
trackChi2 = new TH1F("trackChi2", "trackChi2", 150, 0, 150);
trackChi2ndof = new TH1F("trackChi2ndof", "trackChi2ndof", 100, 0, 50);
......
......@@ -10,8 +10,6 @@ CLICpixEventLoader::CLICpixEventLoader(Configuration config, std::vector<Detecto
void CLICpixEventLoader::initialise(Parameters* par) {
parameters = par;
// File structure is RunX/CLICpix/RunX.dat
// Take input directory from global parameters
......
......@@ -8,8 +8,6 @@ Clicpix2Correlator::Clicpix2Correlator(Configuration config, std::vector<Detecto
void Clicpix2Correlator::initialise(Parameters* par) {
parameters = par;
// Get the DUT ID
dutID = m_config.get<std::string>("DUT");
......
......@@ -8,8 +8,6 @@ Clicpix2EventLoader::Clicpix2EventLoader(Configuration config, std::vector<Detec
void Clicpix2EventLoader::initialise(Parameters* par) {
parameters = par;
// File structure is RunX/CLICpix2/data.csv
// Take input directory from global parameters
......
......@@ -22,8 +22,6 @@ template <typename T> std::string convertToString(T number) {
void ClicpixAnalysis::initialise(Parameters* par) {
parameters = par;
// Initialise member variables
m_eventNumber = 0;
m_triggerNumber = 0;
......
......@@ -14,9 +14,6 @@ DUTAnalysis::DUTAnalysis(Configuration config, std::vector<Detector*> detectors)
void DUTAnalysis::initialise(Parameters* par) {
// Pick up a copy of the parameters
parameters = par;
// Initialise single histograms
tracksVersusTime = new TH1F("tracksVersusTime", "tracksVersusTime", 300000, 0, 300);
associatedTracksVersusTime = new TH1F("associatedTracksVersusTime", "associatedTracksVersusTime", 300000, 0, 300);
......@@ -163,7 +160,7 @@ StatusCode DUTAnalysis::run(Clipboard* clipboard) {
timeSincePowerOn = (double)(track->timestamp() - m_shutterOpenTime) / (4096. * 40000000.);
tracksVersusPowerOnTime->Fill(timeSincePowerOn);
// if(timeSincePowerOn < (0.0002)){
// LOG(TRACE) <<"Track at time "<<parameters->currentTime<<" has
// LOG(TRACE) <<"Track at time "<<clipboard->get_persistent("currentTime")<<" has
// time shutter open of "<<timeSincePowerOn;
// LOG(TRACE) <<"Shutter open time is
// "<<double(m_shutterOpenTime)/(4096.*40000000.)<<", shutter close
......
......@@ -9,9 +9,6 @@ DataDump::DataDump(Configuration config, std::vector<Detector*> detectors)
}
void DataDump::initialise(Parameters* par) {
parameters = par;
// Initialise member variables
m_eventNumber = 0;
}
......
......@@ -33,9 +33,6 @@ FileReader::FileReader(Configuration config, std::vector<Detector*> detectors)
void FileReader::initialise(Parameters* par) {
// Pick up the global parameters
parameters = par;
// Decide what objects will be read in
if(m_readPixels)
m_objectList.push_back("pixels");
......
......@@ -28,9 +28,6 @@ FileWriter::FileWriter(Configuration config, std::vector<Detector*> detectors)
void FileWriter::initialise(Parameters* par) {
// Pick up the global parameters
parameters = par;
// Decide what objects will be written out
if(m_writePixels)
m_objectList.push_back("pixels");
......
......@@ -14,9 +14,6 @@ GUI::GUI(Configuration config, std::vector<Detector*> detectors) : Algorithm(std
void GUI::initialise(Parameters* par) {
// Make the local pointer to the global parameters
parameters = par;
// TApplication keeps the canvases persistent
app = new TApplication("example", 0, 0);
......
......@@ -8,8 +8,6 @@ GenericAlgorithm::GenericAlgorithm(Configuration config, std::vector<Detector*>
void GenericAlgorithm::initialise(Parameters* par) {
parameters = par;
// Initialise histograms per device
for(auto& detector : get_detectors()) {
......
......@@ -11,9 +11,6 @@ OnlineMonitor::OnlineMonitor(Configuration config, std::vector<Detector*> detect
void OnlineMonitor::initialise(Parameters* par) {
// Make the local pointer to the global parameters
parameters = par;
// TApplication keeps the canvases persistent
app = new TApplication("example", 0, 0);
......
......@@ -22,8 +22,6 @@ SpatialTracking::SpatialTracking(Configuration config, std::vector<Detector*> de
void SpatialTracking::initialise(Parameters* par) {
parameters = par;
// Set up histograms
trackChi2 = new TH1F("trackChi2", "trackChi2", 150, 0, 150);
trackChi2ndof = new TH1F("trackChi2ndof", "trackChi2ndof", 100, 0, 50);
......
......@@ -11,8 +11,6 @@ TestAlgorithm::TestAlgorithm(Configuration config, std::vector<Detector*> detect
void TestAlgorithm::initialise(Parameters* par) {
parameters = par;
// Make histograms for each Timepix3
for(auto& detector : get_detectors()) {
LOG(DEBUG) << "Booking histograms for detector " << detector->name();
......
......@@ -11,8 +11,6 @@ Timepix1Correlator::Timepix1Correlator(Configuration config, std::vector<Detecto
void Timepix1Correlator::initialise(Parameters* par) {
parameters = par;
// Initialise histograms per device
for(auto& detector : get_detectors()) {
......
......@@ -33,8 +33,6 @@ bool sortByTime(string filename1, string filename2) {
void Timepix1EventLoader::initialise(Parameters* par) {
parameters = par;
// Take input directory from global parameters
m_inputDirectory = m_config.get<std::string>("inputDirectory");
......
......@@ -10,7 +10,6 @@ Timepix3Clustering::Timepix3Clustering(Configuration config, std::vector<Detecto
void Timepix3Clustering::initialise(Parameters* par) {
parameters = par;
timingCutInt = (timingCut * 4096. * 40000000.);
}
......
......@@ -29,8 +29,6 @@ Timepix3EventLoader::Timepix3EventLoader(Configuration config, std::vector<Detec
void Timepix3EventLoader::initialise(Parameters* par) {
parameters = par;
// File structure is RunX/ChipID/files.dat
// Open the root directory
......@@ -350,7 +348,7 @@ bool Timepix3EventLoader::loadData(Clipboard* clipboard, Detector* detector, Pix
// Ignore packets if they arrive before the current event window
// if(eventLength != 0. && ((double)time/(4096. *
// 40000000.)) < (parameters->currentTime) ){
// 40000000.)) < (clipboard->get_persistent("currentTime")) ){
// continue;
// }
......@@ -476,7 +474,7 @@ bool Timepix3EventLoader::loadData(Clipboard* clipboard, Detector* detector, Pix
// Ignore pixels if they arrive before the current event window
// if(eventLength != 0. && ((double)time/(4096. *
// 40000000.)) < (parameters->currentTime) ){
// 40000000.)) < (clipboard->get_persistent("currentTime")) ){
// continue;
// }
......
......@@ -9,7 +9,6 @@ Timepix3MaskCreator::Timepix3MaskCreator(Configuration config, std::vector<Detec
void Timepix3MaskCreator::initialise(Parameters* par) {
parameters = par;
//
// // Make histograms for each Timepix3
// for(auto& detector : get_detectors()){
......
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