Commit fa8982d8 authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Add few options for the real online process on the DDAQ server

parent 00a3f3bb
Pipeline #36493 passed with stage
in 6 minutes and 6 seconds
......@@ -37,6 +37,9 @@ int main(int argc, char **argv)
if(getenv("FSShiftTrackDir") == nullptr) {
WARN_MESS<<"Environment variable FSShiftTrackDir not defined ==> not used"<<ENDL;
}
if(getenv("FSModeLastRun")) {
INFO_MESS<<"FSModeLastRun defined, Spy only on the last run, not online"<<ENDL;
}
gEnv->SetValue("Gui.IconPath",Form("%s/icons:%s/icons",getenv("ROOTSYS"),getenv("gammaSoftware_DIR")));
......
......@@ -210,10 +210,6 @@ void FSMainWindow::NewTab(TString name, Int_t npx, Int_t npy)
void FSMainWindow::CloseWindow()
{
while(true){
if(oktoclose == false) continue;
UnmapWindow();
DeleteWindow();// launch a delete but after a short time like a thread.
......@@ -221,7 +217,6 @@ void FSMainWindow::CloseWindow()
gApplication->SetReturnFromRun(false);
gApplication->Terminate(false);
}
}
TPad* FSMainWindow::GetSelectedPad()
......@@ -632,7 +627,8 @@ void FSMainWindow::ReadHistograms()
FileName = Form("%s/%.06d",getenv("FSRawDataDir"),Test);
ok = gSystem->IsFileInIncludePath(FileName);
}
Test=Test-2;
if(getenv("FSModeLastRun")) Test=Test-2;
else Test=Test-1;
Run=Form("%.06d",Test);
FileName = Form("%s/%s",getenv("FSRawDataDir"),Run.Data());
}
......@@ -768,12 +764,11 @@ void FSMainWindow::ReadHistograms()
else {
test++;
WARN_MESS<<"Unable to read the full file: read "<<NHistRead<<" histograms, wainting:"<<fDetectors.size()<<", retry num"<<test<<ENDL;
oktoclose = false;
sleep(3);
oktoclose = true;
// sleep(1);
}
file.close();
}
INFO_MESS << fDetectors.size() << "read spectra ==> Done" << ENDL;
fLastRun = Run;
......
......@@ -65,8 +65,6 @@ private:
map <Int_t, Double_t[10]> fListOfCal;
map <Int_t, Double_t[2]> fListOfShiftTrack;
bool oktoclose = true;
/// FIPPSSpy objects
FSMenuBar *fFSMenuBar = nullptr;
......
......@@ -312,6 +312,8 @@ void FSTab::RefreshTab()
if(canvas == nullptr) return;
gErrorIgnoreLevel = kFatal;
TList *lop = canvas->GetListOfPrimitives();
for(int i=0 ; i< lop->GetEntries() ; i++) {
......@@ -338,6 +340,8 @@ void FSTab::RefreshTab()
}
}
canvas->Update();
gErrorIgnoreLevel = kPrint;
}
void FSTab::ApplyPageLog(Bool_t logx, Bool_t logy, Bool_t logz, Bool_t on)
......
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