Cleanup

Author: ChSonnabend

Detectors/TPC/calibration/CMakeLists.txt

@@ -25,7 +25,6 @@ o2_add_library(TPCCalibration
                        src/CalibPadGainTracksBase.cxx
                        src/CalibLaserTracks.cxx
                        src/LaserTracksCalibrator.cxx
-                       src/NeuralNetworkClusterizer.cxx
                        src/SACDecoder.cxx
                        src/IDCAverageGroup.cxx
                        src/IDCAverageGroupBase.cxx
@@ -84,7 +83,6 @@ o2_target_root_dictionary(TPCCalibration
                                   include/TPCCalibration/FastHisto.h
                                   include/TPCCalibration/CalibLaserTracks.h
                                   include/TPCCalibration/LaserTracksCalibrator.h
-                                  include/TPCCalibration/NeuralNetworkClusterizer.h
                                   include/TPCCalibration/SACDecoder.h
                                   include/TPCCalibration/IDCAverageGroup.h
                                   include/TPCCalibration/IDCAverageGroupBase.h

Detectors/TPC/calibration/include/TPCCalibration/NeuralNetworkClusterizer.h

@@ -36,7 +36,7 @@ void GPUTPCNNClusterizerHost::init(const GPUSettingsProcessingNNclusterizer& set
   std::vector<std::string> evalMode = o2::utils::Str::tokenize(settings.nnEvalMode, ':');
 
   if (settings.nnLoadFromCCDB) {
-    reg_model_path = settings.nnLocalFolder + "/net_regression_c1.onnx"; // Needs to be set identical to NeuralNetworkClusterizer.cxx, otherwise the networks might be loaded from the wrong place
+    reg_model_path = settings.nnLocalFolder + "/net_regression_c1.onnx"; // Needs to be set identical to GPUWorkflowSpec.cxx, otherwise the networks might be loaded from the wrong place
     if (evalMode[0] == "c1") {
       class_model_path = settings.nnLocalFolder + "/net_classification_c1.onnx";
     } else if (evalMode[0] == "c2") {

Detectors/TPC/calibration/src/NeuralNetworkClusterizer.cxx

@@ -78,7 +78,6 @@
 #include "DetectorsRaw/RDHUtils.h"
 #include "ITStracking/TrackingInterface.h"
 #include "GPUWorkflowInternal.h"
-#include "TPCCalibration/NeuralNetworkClusterizer.h"
 // #include "Framework/ThreadPool.h"
 
 #include <TStopwatch.h>
@@ -804,15 +803,13 @@ void GPURecoWorkflowSpec::run(ProcessingContext& pc)
       size_t size = DataRefUtils::getPayloadSize(m);
       if (nnClusterizerSettings.nnCCDBDumpToFile == 1) {
         dumpOnnxToFile(buffer, size, "net_classification_c1.onnx");
-        LOG(info) << "(NN CLUS) Dumped nn_classification_c1 from CCDB to net_classification_c1.onnx";
       }
     } else if (evalMode[0] == "c2") {
       m = pc.inputs().get("nn_classification_c2");
       const char* buffer = const_cast<char*>(m.payload);
       size_t size = DataRefUtils::getPayloadSize(m);
       if (nnClusterizerSettings.nnCCDBDumpToFile == 1) {
         dumpOnnxToFile(buffer, size, "net_classification_c2.onnx");
-        LOG(info) << "(NN CLUS) Dumped nn_classification_c2 from CCDB to net_classification_c2.onnx";
       }
     }
 
@@ -821,15 +818,13 @@ void GPURecoWorkflowSpec::run(ProcessingContext& pc)
     size_t size = DataRefUtils::getPayloadSize(m);
     if (nnClusterizerSettings.nnCCDBDumpToFile == 1) {
       dumpOnnxToFile(buffer, size, "net_regression_c1.onnx");
-      LOG(info) << "(NN CLUS) Dumped nn_regression_c1 from CCDB to net_regression_c1.onnx";
     }
     if (evalMode[1] == "r2") {
       m = pc.inputs().get("nn_regression_c2");
       const char* buffer = const_cast<char*>(m.payload);
       size_t size = DataRefUtils::getPayloadSize(m);
       if (nnClusterizerSettings.nnCCDBDumpToFile == 1) {
         dumpOnnxToFile(buffer, size, "net_regression_c2.onnx");
-        LOG(info) << "(NN CLUS) Dumped nn_regression_c2 from CCDB to net_regression_c2.onnx";
       }
     }
   }
@@ -1292,9 +1287,9 @@ Inputs GPURecoWorkflowSpec::inputs()
     std::map<std::string, std::string> metadata;
     metadata["inputDType"] = nnClusterizerSettings.nnInferenceInputDType;                               // FP16 or FP32
     metadata["outputDType"] = nnClusterizerSettings.nnInferenceOutputDType;                             // FP16 or FP32
-    metadata["nnCCDBWithMomentum"] = nnClusterizerSettings.nnCCDBWithMomentum;          // 0, 1 -> Only for regression model
+    metadata["nnCCDBWithMomentum"] = nnClusterizerSettings.nnCCDBWithMomentum;                          // 0, 1 -> Only for regression model
     metadata["nnCCDBLayerType"] = nnClusterizerSettings.nnCCDBClassificationLayerType;                  // FC, CNN
-    metadata["nnCCDBInteractionRate"] = nnClusterizerSettings.nnCCDBInteractionRate;    // in kHz
+    metadata["nnCCDBInteractionRate"] = nnClusterizerSettings.nnCCDBInteractionRate;                    // in kHz
     metadata["nnCCDBBeamType"] = nnClusterizerSettings.nnCCDBBeamType;                                  // pp, pPb, PbPb
 
     auto convert_map_to_metadata = [](const std::map<std::string, std::string>& inputMap, std::vector<o2::framework::CCDBMetadata>& outputMetadata) {
@@ -1308,13 +1303,15 @@ Inputs GPURecoWorkflowSpec::inputs()
     std::vector<std::string> evalMode = o2::utils::Str::tokenize(nnClusterizerSettings.nnEvalMode, ':');
     std::vector<o2::framework::CCDBMetadata> ccdb_metadata;
 
-    auto printSettings = [](const std::map<std::string, std::string>& settings) {
-      LOG(info) << "(NN CLUS) NN Clusterizer CCDB settings:";
-      for (const auto& [key, value] : settings) {
-        LOG(info) << "  " << key << " : " << value;
-      }
-    };
-    printSettings(metadata);
+    if (mConfParam->printSettings) {
+      auto printSettings = [](const std::map<std::string, std::string>& settings) {
+        LOG(info) << "(NN CLUS) NN Clusterizer CCDB settings:";
+        for (const auto& [key, value] : settings) {
+          LOG(info) << "  " << key << " : " << value;
+        }
+      };
+      printSettings(metadata);
+    }
 
     if (evalMode[0] == "c1") {
       metadata["nnCCDBEvalType"] = "classification_c1";