o2-eve, o2-eve-export-workflow: fix option for not deleting a files, fix screenshots done too early (befor tracks are ready)

Julian Myrcha · davidrohr · commit f98caa603666 · 2022-07-14T03:08:53.000+02:00
diff --git a/EventVisualisation/Base/src/DirectoryLoader.cxx b/EventVisualisation/Base/src/DirectoryLoader.cxx
@@ -39,6 +39,9 @@ deque<string> DirectoryLoader::load(const std::string& path, const std::string&
 
 void DirectoryLoader::reduceNumberOfFiles(const std::string& path, const std::deque<std::string>& files, std::size_t filesInFolder)
 {
+  if (filesInFolder == -1) {
+    return; // do not reduce
+  }
   int items = files.size() - std::min(files.size(), filesInFolder);
   for (int i = 0; i < items; i++) {
     std::remove((path + "/" + files[i]).c_str()); // delete file
diff --git a/EventVisualisation/View/include/EventVisualisationView/EventManagerFrame.h b/EventVisualisation/View/include/EventVisualisationView/EventManagerFrame.h
@@ -69,6 +69,7 @@ class EventManagerFrame : public TGMainFrame
   static void makeSliderRangeEntries(TGCompositeFrame* parent, int height,
                                      TGNumberEntryField*& minEntry, const TString& minToolTip,
                                      TGNumberEntryField*& maxEntry, const TString& maxToolTip);
+  void createOutreachScreenshot();
 
  protected:
   o2::event_visualisation::EventManager* mEventManager; // Model object.
diff --git a/EventVisualisation/View/src/EventManagerFrame.cxx b/EventVisualisation/View/src/EventManagerFrame.cxx
@@ -312,12 +312,36 @@ void EventManagerFrame::checkMemory()
   }
 }
 
+void EventManagerFrame::createOutreachScreenshot()
+{
+  if (!Options::Instance()->imageFolder().empty()) {
+    string fileName = mEventManager->getInstance().getDataSource()->getEventName();
+    if (fileName.size() < 5) {
+      return;
+    }
+    string imageFolder = Options::Instance()->imageFolder();
+    if (!std::filesystem::is_directory(imageFolder)) {
+      std::filesystem::create_directory(imageFolder);
+    }
+    fileName = imageFolder + "/" + fileName.substr(0, fileName.find_last_of('.')) + ".png";
+    if (!std::filesystem::is_regular_file(fileName)) {
+      Screenshot::perform(fileName, this->mEventManager->getDataSource()->getDetectorsMask(),
+                          this->mEventManager->getDataSource()->getRunNumber(),
+                          this->mEventManager->getDataSource()->getFirstTForbit(),
+                          this->mEventManager->getDataSource()->getCollisionTime());
+      DirectoryLoader::reduceNumberOfFiles(imageFolder, DirectoryLoader::load(imageFolder, "_", ".png"), 10);
+    }
+    // LOG(info) << mEventManager->getInstance().getDataSource()->getEventName();
+  }
+}
+
 void EventManagerFrame::DoTimeTick()
 {
   if (not setInTick()) {
     return;
   }
   checkMemory(); // exits if memory usage too high = prevents freezing long-running machine
+  this->createOutreachScreenshot();
   bool refreshNeeded = mEventManager->getDataSource()->refresh();
   if (this->mDisplayMode == SequentialMode) {
     mEventManager->getDataSource()->rollToNext();
@@ -326,21 +350,6 @@ void EventManagerFrame::DoTimeTick()
 
   if (refreshNeeded) {
     mEventManager->displayCurrentEvent();
-    if (!Options::Instance()->imageFolder().empty()) {
-      string fileName = mEventManager->getInstance().getDataSource()->getEventName();
-      string imageFolder = Options::Instance()->imageFolder();
-      if (!std::filesystem::is_directory(imageFolder)) {
-        std::filesystem::create_directory(imageFolder);
-      }
-      fileName = imageFolder + "/" + fileName.substr(0, fileName.find_last_of('.')) + ".png";
-      Screenshot::perform(fileName, this->mEventManager->getDataSource()->getDetectorsMask(),
-                          this->mEventManager->getDataSource()->getRunNumber(),
-                          this->mEventManager->getDataSource()->getFirstTForbit(),
-                          this->mEventManager->getDataSource()->getCollisionTime());
-      DirectoryLoader::reduceNumberOfFiles(imageFolder, DirectoryLoader::load(imageFolder, "_", ".png"), 10);
-
-      LOG(info) << mEventManager->getInstance().getDataSource()->getEventName();
-    }
   }
   mEventId->SetIntNumber(mEventManager->getDataSource()->getCurrentEvent());
   clearInTick();

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ deque<string> DirectoryLoader::load(const std::string& path, const std::string&`
`39`	`39`
`40`	`40`	`void DirectoryLoader::reduceNumberOfFiles(const std::string& path, const std::deque<std::string>& files, std::size_t filesInFolder)`
`41`	`41`	`{`
	`42`	`+ if (filesInFolder == -1) {`
	`43`	`+ return; // do not reduce`
	`44`	`+ }`
`42`	`45`	`int items = files.size() - std::min(files.size(), filesInFolder);`
`43`	`46`	`for (int i = 0; i < items; i++) {`
`44`	`47`	`std::remove((path + "/" + files[i]).c_str()); // delete file`