Commit cce738a5 authored by Christof Metzger-Kraus's avatar Christof Metzger-Kraus
Browse files

working on #62

parent 8bcd6a4d
...@@ -152,6 +152,14 @@ struct OpalDataImpl { ...@@ -152,6 +152,14 @@ struct OpalDataImpl {
OpalDataImpl::OpalDataImpl(): OpalDataImpl::OpalDataImpl():
mainDirectory(), referenceMomentum(0), modified(false), itsTitle_m(), mainDirectory(), referenceMomentum(0), modified(false), itsTitle_m(),
restart_dump_freq_m(1), last_step_m(0), restart_dump_freq_m(1), last_step_m(0),
hasPriorRun_m(false),
isRestart_m(false),
hasRestartFile_m(false),
hasBunchAllocated_m(false),
hasDataSinkAllocated_m(false),
hasSLBunchAllocated_m(false),
gPhaseShift_m(0.0),
maxTrackSteps_m(0),
isInOPALCyclMode_m(false), isInOPALCyclMode_m(false),
isInOPALTMode_m(false), isInOPALTMode_m(false),
isInOPALEnvMode_m(false), isInOPALEnvMode_m(false),
...@@ -247,19 +255,6 @@ void OpalData::incMaxTrackSteps(unsigned long long s) { ...@@ -247,19 +255,6 @@ void OpalData::incMaxTrackSteps(unsigned long long s) {
OpalData::OpalData() { OpalData::OpalData() {
p = new OpalDataImpl(); p = new OpalDataImpl();
p->hasPriorRun_m = false;
p->isRestart_m = false;
p->hasRestartFile_m = false;
p->hasBunchAllocated_m = false;
p->hasDataSinkAllocated_m = false;
p->hasSLBunchAllocated_m = false;
p->gPhaseShift_m = 0.0;
p->maxPhases_m.clear();
p->maxTrackSteps_m = 0;
p->isInOPALCyclMode_m = false;
p->isInOPALTMode_m = false;
p->isInOPALEnvMode_m = false;
p->isInPrepState_m = false;
} }
OpalData::~OpalData() { OpalData::~OpalData() {
...@@ -794,4 +789,4 @@ std::vector<std::string> OpalData::getAllNames() { ...@@ -794,4 +789,4 @@ std::vector<std::string> OpalData::getAllNames() {
//// /DTA //// /DTA
return result; return result;
} }
\ No newline at end of file
...@@ -92,7 +92,7 @@ void StatisticalErrors::execute() { ...@@ -92,7 +92,7 @@ void StatisticalErrors::execute() {
std::string replicasFormerDirectory = runningJobs[source.second - 1]; std::string replicasFormerDirectory = runningJobs[source.second - 1];
char runNumber[6]; char runNumber[6];
sprintf(runNumber, "%05d", instance); sprintf(runNumber, "%05u", instance);
std::string nextDir = directoryBaseName + "_run_" + std::string(runNumber); std::string nextDir = directoryBaseName + "_run_" + std::string(runNumber);
if (!referenceDone) { if (!referenceDone) {
nextDir = getNextDirectoryName(true); nextDir = getNextDirectoryName(true);
......
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