fix crash due to wrong treatment of pointers (see #104 (comment))

HEP-FCC · Aug 29, 2024 · 2a9e592 · 2a9e592
1 parent 24fc6e0
commit 2a9e592
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp b/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp
@@ -129,9 +129,9 @@ StatusCode AugmentClustersFCCee::initialize()
       showerShapeDecorations.push_back(Form("energy_fraction_%s_layer_%d", detector, layer));
       showerShapeDecorations.push_back(Form("theta_%s_layer_%d", detector, layer));
       showerShapeDecorations.push_back(Form("phi_%s_layer_%d", detector, layer));
-      showerShapeDecorations.push_back(Form("maxcell_E_%s_layer_%d", detector, layer));
       // pi0/photon shape var only calculated in EMB
       if (m_do_photon_shapeVar && m_systemIDs[k] == systemID_EMB) {
+        showerShapeDecorations.push_back(Form("maxcell_E_%s_layer_%d", detector, layer));
         showerShapeDecorations.push_back(Form("width_theta_%s_layer_%d", detector, layer));
         showerShapeDecorations.push_back(Form("width_module_%s_layer_%d", detector, layer));
         showerShapeDecorations.push_back(Form("Ratio_E_max_2ndmax_%s_layer_%d", detector, layer));
@@ -651,7 +651,7 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
               return StatusCode::FAILURE;
             }
             width_theta[layer+startPositionToFill] = (sumEnLayer[layer+startPositionToFill] > 0.) ? std::sqrt(std::fabs(w_theta2)) : 0. ;
-	  }
+	        }
           double w_module2 = module2_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill] - std::pow(module_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill], 2);
           // Very small but negative values caused by computational precision are allowed,
           // otherwise crash.

diff --git a/RecFCCeeCalorimeter/src/components/CalibrateCaloClusters.cpp b/RecFCCeeCalorimeter/src/components/CalibrateCaloClusters.cpp
@@ -169,9 +169,24 @@ StatusCode CalibrateCaloClusters::finalize()
 {
   if (m_ortSession)
     delete m_ortSession;
+
   if (m_ortEnv)
     delete m_ortEnv;
 
+  for (std::size_t i = 0; i < m_input_names.size(); i++) {
+    if (m_input_names.at(i)) {
+      delete m_input_names.at(i);
+    }
+  }
+  m_input_names.resize(0);
+
+  for (std::size_t i = 0; i < m_output_names.size(); i++) {
+    if (m_output_names.at(i)) {
+      delete m_output_names.at(i);
+    }
+  }
+  m_output_names.resize(0);
+
   return Gaudi::Algorithm::finalize();
 }
 
@@ -271,7 +286,7 @@ StatusCode CalibrateCaloClusters::readCalibrationFile(const std::string &calibra
 #if ORT_API_VERSION < 13
     m_output_names.emplace_back(AllocatedStringPtr(m_ortSession->GetOutputName(i, allocator), allocDeleter).release());
 #else
-    m_output_names.emplace_back(m_ortSession->GetOutputNameAllocated(i, allocator).get());
+    m_output_names.emplace_back(m_ortSession->GetOutputNameAllocated(i, allocator).release());
 #endif
     m_output_shapes = m_ortSession->GetOutputTypeInfo(i).GetTensorTypeAndShapeInfo().GetShape();
     debug() << "\t" << m_output_names.at(i) << " : ";

diff --git a/RecFCCeeCalorimeter/src/components/PhotonIDTool.cpp b/RecFCCeeCalorimeter/src/components/PhotonIDTool.cpp
@@ -134,9 +134,24 @@ StatusCode PhotonIDTool::finalize()
 {
   if (m_ortSession)
     delete m_ortSession;
+
   if (m_ortEnv)
     delete m_ortEnv;
 
+  for (std::size_t i = 0; i < m_input_names.size(); i++) {
+    if (m_input_names.at(i)) {
+      delete m_input_names.at(i);
+    }
+  }
+  m_input_names.resize(0);
+
+  for (std::size_t i = 0; i < m_output_names.size(); i++) {
+    if (m_output_names.at(i)) {
+      delete m_output_names.at(i);
+    }
+  }
+  m_output_names.resize(0);
+
   return Gaudi::Algorithm::finalize();
 }
 
@@ -341,7 +356,7 @@ StatusCode PhotonIDTool::readMVAFiles(const std::string& mvaInputsFileName,
 #if ORT_API_VERSION < 13
     m_output_names.emplace_back(AllocatedStringPtr(m_ortSession->GetOutputName(i, allocator), allocDeleter).release());
 #else
-    m_output_names.emplace_back(m_ortSession->GetOutputNameAllocated(i, allocator).get());
+    m_output_names.emplace_back(m_ortSession->GetOutputNameAllocated(i, allocator).release());
 #endif
 
     m_output_shapes = m_ortSession->GetOutputTypeInfo(i).GetTensorTypeAndShapeInfo().GetShape();