Revert "bulk generation of screenshots (#10706)"

davidrohr · davidrohr · commit 49b90710b423 · 2023-02-26T21:42:15.000+01:00
This reverts commit 39c5a4b.
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/DataSource.h b/EventVisualisation/Base/include/EventVisualisationBase/DataSource.h
@@ -65,7 +65,7 @@ class DataSource
   void operator=(DataSource const&) = delete;
 
   virtual std::vector<std::pair<VisualisationEvent, EVisualisationGroup>> getVisualisationList(int no, float minTime, float maxTime, float range) = 0;
-  virtual bool rollToNext() { return false; };
+  virtual void rollToNext(){};
   virtual void changeDataFolder(std::string /*newFolder*/){};
   virtual void saveCurrentEvent(std::string /*targetFolder*/){};
   virtual int getRunNumber() const { return 0; }
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/DataSourceOnline.h b/EventVisualisation/Base/include/EventVisualisationBase/DataSourceOnline.h
@@ -58,7 +58,7 @@ class DataSourceOnline : public DataSource
   bool refresh() override; // recompute
 
   std::vector<std::pair<VisualisationEvent, EVisualisationGroup>> getVisualisationList(int no, float minTime, float maxTime, float range) override;
-  bool rollToNext() override { return mFileWatcher.rollToNext(); };
+  void rollToNext() override { mFileWatcher.rollToNext(); };
   void changeDataFolder(std::string newFolder) override { mFileWatcher.changeFolder(newFolder); };
   void saveCurrentEvent(std::string targetFolder) override { mFileWatcher.saveCurrentFileToFolder(targetFolder); };
   int getRunNumber() const override { return this->mRunNumber; }
diff --git a/EventVisualisation/Base/include/EventVisualisationBase/FileWatcher.h b/EventVisualisation/Base/include/EventVisualisationBase/FileWatcher.h
@@ -47,7 +47,7 @@ class FileWatcher
   void setLast();
   void setNext();
   void setPrev();
-  bool rollToNext();                   ///< round robin next item, returns True if restart from beginning happened
+  void rollToNext();                   ///< round robin next item
   bool refresh();                      ///< reads folder content, updates current if points to not existing file
   std::string currentItem() const;     ///< name of the file (without path) but guards replaced with file names
   void setCurrentItem(int no);         ///< sets using index
diff --git a/EventVisualisation/Base/src/FileWatcher.cxx b/EventVisualisation/Base/src/FileWatcher.cxx
@@ -82,18 +82,16 @@ string FileWatcher::currentItem() const
   return this->mCurrentFile;
 }
 
-bool FileWatcher::rollToNext()
+void FileWatcher::rollToNext()
 {
   if (this->mFiles.size() == 2) { // only guards on the list
-    return true;                  // nothing to do, but means we stay at the beginning
+    return;                       // nothing to do
   }
   this->setNext();
   if (this->mCurrentFile == mEndGuard) {
     this->setFirst();
     this->setNext();
-    return true; // we stay at the beginning
   }
-  return false;
 }
 
 void FileWatcher::setFirst()
diff --git a/EventVisualisation/DataConverter/CMakeLists.txt b/EventVisualisation/DataConverter/CMakeLists.txt
@@ -17,7 +17,6 @@ o2_add_library(EventVisualisationDataConverter
                        src/VisualisationEventSerializer.cxx
                        src/VisualisationEventJSONSerializer.cxx
                        src/VisualisationEventROOTSerializer.cxx
-                       src/Statistic.cxx
                PUBLIC_LINK_LIBRARIES RapidJSON::RapidJSON
                         O2::ReconstructionDataFormats
                         O2::DataFormatsParameters
diff --git a/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/Statistic.h b/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/Statistic.h
diff --git a/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEvent.h b/EventVisualisation/DataConverter/include/EventVisualisationDataConverter/VisualisationEvent.h
@@ -53,12 +53,6 @@ class VisualisationEvent
   VisualisationEvent();
   VisualisationEvent(const VisualisationEvent& source, EVisualisationGroup filter, float minTime, float maxTime);
 
-  struct Statistic {
-    int mTrackCount[o2::dataformats::GlobalTrackID::NSources];
-  };
-  void computeStatistic();
-  static const Statistic& getStatistic() { return mLastStatistic; }
-
   /// constructor parametrisation (Value Object) for VisualisationEvent class
   ///
   /// Simplifies passing parameters to constructor of VisualisationEvent
@@ -206,7 +200,6 @@ class VisualisationEvent
   void setPrimaryVertex(std::size_t pv) { this->mPrimaryVertex = pv; }
 
  private:
-  static Statistic mLastStatistic;                  /// last
   int mClMask;                                      /// clusters requested during aquisition
   int mTrkMask;                                     /// tracks requested during aquisition
   o2::header::DataHeader::RunNumberType mRunNumber; /// run number
diff --git a/EventVisualisation/DataConverter/src/Statistic.cxx b/EventVisualisation/DataConverter/src/Statistic.cxx
diff --git a/EventVisualisation/DataConverter/src/VisualisationEvent.cxx b/EventVisualisation/DataConverter/src/VisualisationEvent.cxx
@@ -150,16 +150,4 @@ void VisualisationEvent::afterLoading()
   }
 }
 
-VisualisationEvent::Statistic VisualisationEvent::mLastStatistic;
-
-void VisualisationEvent::computeStatistic()
-{
-  for (int i = 0; i < o2::dataformats::GlobalTrackID::NSources; i++) {
-    mLastStatistic.mTrackCount[i] = 0;
-  }
-  for (auto track : this->getTracksSpan()) {
-    mLastStatistic.mTrackCount[track.getSource()]++;
-  }
-}
-
 } // namespace o2
diff --git a/EventVisualisation/Detectors/src/DataReaderJSON.cxx b/EventVisualisation/Detectors/src/DataReaderJSON.cxx
@@ -29,7 +29,6 @@ VisualisationEvent DataReaderJSON::getEvent(std::string fileName)
   VisualisationEvent vEvent;
   auto serializer = VisualisationEventSerializer::getInstance(std::filesystem::path(fileName).extension());
   serializer->fromFile(vEvent, fileName);
-  vEvent.computeStatistic();
   return vEvent;
 }
 
diff --git a/EventVisualisation/View/include/EventVisualisationView/EventManager.h b/EventVisualisation/View/include/EventVisualisationView/EventManager.h
@@ -80,7 +80,6 @@ class EventManager final : public TEveEventManager, public TQObject
   bool mShowDate = true;
   bool getShowDate() const { return mShowDate; }
   void setShowDate(bool value) { this->mShowDate = value; }
-  void createVisualisationSettings(rapidjson::Document& tree, rapidjson::Document::AllocatorType& allocator);
 
  private:
   struct VizSettings {
diff --git a/EventVisualisation/View/include/EventVisualisationView/EventManagerFrame.h b/EventVisualisation/View/include/EventVisualisationView/EventManagerFrame.h
@@ -79,7 +79,6 @@ class EventManagerFrame : public TGMainFrame
                                      TGNumberEntryField*& minEntry, const TString& minToolTip,
                                      TGNumberEntryField*& maxEntry, const TString& maxToolTip);
   void createOutreachScreenshot();
-  void createManualScreenshot();
 
  protected:
   o2::event_visualisation::EventManager* mEventManager; // Model object.
@@ -95,7 +94,7 @@ class EventManagerFrame : public TGMainFrame
 
   void setRunMode(EventManagerFrame::RunMode runMode, Bool_t emit = kTRUE);
 
-  EventManagerFrame(o2::event_visualisation::EventManager& eventManager, EventManagerFrame::DisplayMode displayMode);
+  EventManagerFrame(o2::event_visualisation::EventManager& eventManager);
   ~EventManagerFrame() override;
   ClassDefOverride(EventManagerFrame, 0); // GUI window for AliEveEventManager.
 
@@ -124,7 +123,7 @@ class EventManagerFrame : public TGMainFrame
   void DoTimeFrameSliderChanged();
 
  public: // static functions
-  static TString getSourceDirectory(EventManagerFrame::RunMode runMode, EventManagerFrame::DisplayMode displayMode);
+  static TString getSourceDirectory(EventManagerFrame::RunMode runMode);
   static RunMode decipherRunMode(TString name, RunMode defaultRun = SyntheticRun);
   static TString getRunTypeString(EventManagerFrame::RunMode runMode);
 };
diff --git a/EventVisualisation/View/include/EventVisualisationView/Options.h b/EventVisualisation/View/include/EventVisualisationView/Options.h
@@ -36,8 +36,6 @@ class Options
   std::string mImageFolder;      // -i './'
   long mMemoryLimit;             // -m 1500 (MB) = 1.5GB
   bool mHideDplGUI;              // -hg
-  bool mGenerateScreenshots;     // -gs
-  bool mSequential;
   std::string mAODConverterPath; // -a 'o2-eve-aodconverter'
 
   // helper methods
@@ -51,17 +49,15 @@ class Options
   bool processCommandLine(int argc, char* argv[]);
 
   // get access methods
-  bool sequential() const { return this->mSequential; }
-  bool json() const { return this->mJSON; }
-  bool online() const { return this->mOnline; }
-  std::string dataFolder() const { return this->mDataFolder; }
-  std::string imageFolder() const { return this->mImageFolder; }
-  std::string savedDataFolder() const { return this->mSavedDataFolder; }
-  std::string fileName() const { return this->mFileName; }
-  bool randomTracks() const { return this->mRandomTracks; }
-  long memoryLimit() const { return this->mMemoryLimit; }
-  bool hideDplGUI() const { return this->mHideDplGUI; }
-  bool generateScreenshots() const { return this->mGenerateScreenshots; }
+  bool json() { return this->mJSON; }
+  bool online() { return this->mOnline; }
+  std::string dataFolder() { return this->mDataFolder; }
+  std::string imageFolder() { return this->mImageFolder; }
+  std::string savedDataFolder() { return this->mSavedDataFolder; }
+  std::string fileName() { return this->mFileName; }
+  bool randomTracks() { return this->mRandomTracks; }
+  long memoryLimit() { return this->mMemoryLimit; }
+  bool hideDplGUI() { return this->mHideDplGUI; }
   std::string AODConverterPath() { return this->mAODConverterPath; }
 };
 
diff --git a/EventVisualisation/View/src/EventManager.cxx b/EventVisualisation/View/src/EventManager.cxx
@@ -368,25 +368,6 @@ void EventManager::displayCalorimeters(VisualisationEvent& event, const std::str
 }
 
 void EventManager::saveVisualisationSettings()
-{
-  ofstream settings(TEMP_SETTINGS_PATH);
-
-  if (settings.good()) {
-    Document d;
-    d.SetObject();
-    auto& allocator = d.GetAllocator();
-
-    createVisualisationSettings(d, allocator);
-
-    StringBuffer strbuf;
-    Writer<StringBuffer> writer(strbuf);
-    d.Accept(writer);
-
-    settings << strbuf.GetString();
-  }
-}
-
-void EventManager::createVisualisationSettings(rapidjson::Document& d, rapidjson::Document::AllocatorType& allocator)
 {
   const auto& tracks = *dataTypeLists[EVisualisationDataType::Tracks];
 
@@ -416,6 +397,13 @@ void EventManager::createVisualisationSettings(rapidjson::Document& d, rapidjson
     }
   }
 
+  ofstream settings(TEMP_SETTINGS_PATH);
+
+  if (settings.good()) {
+    Document d;
+    d.SetObject();
+    auto& allocator = d.GetAllocator();
+
     auto jsonArray = [](const auto& array, auto& allocator) {
       Value arr(kArrayType);
 
@@ -451,12 +439,20 @@ void EventManager::createVisualisationSettings(rapidjson::Document& d, rapidjson
       } else if (camera.IsPerspective()) {
         obj.AddMember("fov", dynamic_cast<TGLPerspectiveCamera&>(camera).GetFOV(), allocator);
       }
+
       return obj;
     };
 
     d.AddMember("camera3d", jsonCamera(MultiView::View3d, allocator), allocator);
     d.AddMember("cameraRphi", jsonCamera(MultiView::ViewRphi, allocator), allocator);
     d.AddMember("cameraZY", jsonCamera(MultiView::ViewZY, allocator), allocator);
+
+    StringBuffer strbuf;
+    Writer<StringBuffer> writer(strbuf);
+    d.Accept(writer);
+
+    settings << strbuf.GetString();
+  }
 }
 
 void EventManager::restoreVisualisationSettings()
diff --git a/EventVisualisation/View/src/EventManagerFrame.cxx b/EventVisualisation/View/src/EventManagerFrame.cxx
diff --git a/EventVisualisation/View/src/Initializer.cxx b/EventVisualisation/View/src/Initializer.cxx
diff --git a/EventVisualisation/View/src/Options.cxx b/EventVisualisation/View/src/Options.cxx
diff --git a/EventVisualisation/Workflow/src/O2DPLDisplay.cxx b/EventVisualisation/Workflow/src/O2DPLDisplay.cxx

Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,16 @@ string FileWatcher::currentItem() const`
`82`	`82`	`return this->mCurrentFile;`
`83`	`83`	`}`
`84`	`84`
`85`		`-bool FileWatcher::rollToNext()`
	`85`	`+void FileWatcher::rollToNext()`
`86`	`86`	`{`
`87`	`87`	`if (this->mFiles.size() == 2) { // only guards on the list`
`88`		`- return true; // nothing to do, but means we stay at the beginning`
	`88`	`+ return; // nothing to do`
`89`	`89`	`}`
`90`	`90`	`this->setNext();`
`91`	`91`	`if (this->mCurrentFile == mEndGuard) {`
`92`	`92`	`this->setFirst();`
`93`	`93`	`this->setNext();`
`94`		`- return true; // we stay at the beginning`
`95`	`94`	`}`
`96`		`- return false;`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`void FileWatcher::setFirst()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ VisualisationEvent DataReaderJSON::getEvent(std::string fileName)`
`29`	`29`	`VisualisationEvent vEvent;`
`30`	`30`	`auto serializer = VisualisationEventSerializer::getInstance(std::filesystem::path(fileName).extension());`
`31`	`31`	`serializer->fromFile(vEvent, fileName);`
`32`		`- vEvent.computeStatistic();`
`33`	`32`	`return vEvent;`
`34`	`33`	`}`
`35`	`34`