Update cleanup

Author: njacazio

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -64,7 +64,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
     return false;
   }
 
-  const std::string localFilename = o2::fastsim::GeometryEntry::accessFile(filename, "./.ALICE3/LUTs/", mCcdbManager);
+  const std::string localFilename = o2::fastsim::GeometryEntry::accessFile(filename, "./.ALICE3/LUTs/", mCcdbManager, 60);
   mLUTHeader[ipdg] = new lutHeader_t;
 
   std::ifstream lutFile(localFilename, std::ifstream::binary);

ALICE3/Core/GeometryContainer.cxx

@@ -77,6 +77,7 @@ std::map<std::string, std::map<std::string, std::string>> GeometryEntry::parseTE
   return configMap;
 }
 
+bool GeometryContainer::mCleanLutWhenLoaded = true;
 void GeometryContainer::init(o2::framework::InitContext& initContext)
 {
   std::vector<std::string> detectorConfiguration;
@@ -219,7 +220,7 @@ std::string GeometryEntry::accessFile(const std::string& path, const std::string
     LOG(info) << " --- CCDB source detected for detector geometry " << path;
     std::map<std::string, std::string> metadata;
     bool status = ccdb->getCCDBAccessor().retrieveBlob(ccdbPath, downloadPath, metadata, 1);
-    if(!status) {
+    if (!status) {
       flock(lockFd, LOCK_UN);
       close(lockFd);
       LOG(fatal) << " --- Failed to retrieve geometry configuration from CCDB for path: " << ccdbPath;
@@ -251,10 +252,11 @@ std::string GeometryEntry::accessFile(const std::string& path, const std::string
     close(lockFd);
 
     // If timeout is specified, schedule file deletion after timeout
-    if (timeoutSeconds > 0) {
+    if (timeoutSeconds > 0 && GeometryContainer::cleanLutWhenLoaded()) {
+      LOG(info) << " --- Deleting geometry configuration file after timeout: " << localPath;
       std::thread deletionThread([localPath, doneFile, timeoutSeconds]() {
+        LOG(info) << " --- Operating deletion of geometry configuration file after timeout: " << localPath;
         std::this_thread::sleep_for(std::chrono::seconds(timeoutSeconds));
-        LOG(info) << " --- Deleting geometry configuration file after timeout: " << localPath;
         if (std::remove(localPath.c_str()) == 0) {
           LOG(info) << " --- File deleted successfully: " << localPath;
         } else {

ALICE3/Core/GeometryContainer.h

@@ -87,15 +87,15 @@ class GeometryContainer
 
   // Add a geometry entry from a configuration file
   void addEntry(const std::string& filename) { mEntries.emplace_back(filename, mCcdb); }
-  void setLutCleanupSetting(const bool cleanLutWhenLoaded) { mCleanLutWhenLoaded = cleanLutWhenLoaded; }
+  static void setLutCleanupSetting(const bool cleanLutWhenLoaded) { mCleanLutWhenLoaded = cleanLutWhenLoaded; }
   void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdb = mgr; }
 
   // Getters
   int getNumberOfConfigurations() const { return mEntries.size(); }
   const std::vector<GeometryEntry>& getEntries() const { return mEntries; }
   const GeometryEntry& getEntry(const int id) const { return mEntries.at(id); }
   GeometryEntry getGeometryEntry(const int id) const { return mEntries.at(id); }
-  bool cleanLutWhenLoaded() const { return mCleanLutWhenLoaded; }
+  static bool cleanLutWhenLoaded() { return mCleanLutWhenLoaded; }
 
   // Get configuration maps
   std::map<std::string, std::map<std::string, std::string>> getConfigurations(const int id) const { return mEntries.at(id).getConfigurations(); }
@@ -106,7 +106,7 @@ class GeometryContainer
   float getFloatValue(const int id, const std::string& layerName, const std::string& key) const { return mEntries.at(id).getFloatValue(layerName, key); }
 
  private:
-  bool mCleanLutWhenLoaded = true; // Whether to clean the LUT when loading a new geometry configuration
+  static bool mCleanLutWhenLoaded; // Whether to clean the LUT when loading a new geometry configuration
   std::vector<GeometryEntry> mEntries;
   o2::ccdb::BasicCCDBManager* mCcdb = nullptr;
 };