fix AlignmentProducerBase::writeDB

cms-sw · May 11, 2022 · eb88897 · eb88897
1 parent fb7e18c
commit eb88897
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
@@ -887,23 +887,25 @@ void AlignmentProducerBase::writeDB(Alignments* alignments,
                                     const std::string& errRcd,
                                     const AlignTransform* globalCoordinates,
                                     cond::Time_t time) const {
-  Alignments tempAlignments = *alignments;
-  AlignmentErrorsExtended tempAlignmentErrorsExtended = *alignmentErrors;
+  Alignments* tempAlignments = alignments;
+  AlignmentErrorsExtended* tempAlignmentErrorsExtended = alignmentErrors;
 
   // Call service
   edm::Service<cond::service::PoolDBOutputService> poolDb;
-  if (!poolDb.isAvailable()) {  // Die if not available
+  if (!poolDb.isAvailable()) {           // Die if not available
+    delete tempAlignments;               // promised to take over ownership...
+    delete tempAlignmentErrorsExtended;  // ditto
     throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
   }
 
   if (globalCoordinates  // happens only if (applyDbAlignment_ == true)
       && globalCoordinates->transform() != AlignTransform::Transform::Identity) {
-    Alignments tempAlignments{};                            // temporary storage for
-    AlignmentErrorsExtended tempAlignmentErrorsExtended{};  // final alignments and errors
+    tempAlignments = new Alignments();                            // temporary storage for
+    tempAlignmentErrorsExtended = new AlignmentErrorsExtended();  // final alignments and errors
 
     GeometryAligner aligner;
     aligner.removeGlobalTransform(
-        alignments, alignmentErrors, *globalCoordinates, &tempAlignments, &tempAlignmentErrorsExtended);
+        alignments, alignmentErrors, *globalCoordinates, tempAlignments, tempAlignmentErrorsExtended);
 
     delete alignments;       // have to delete original alignments
     delete alignmentErrors;  // same thing for the errors
@@ -915,12 +917,16 @@ void AlignmentProducerBase::writeDB(Alignments* alignments,
 
   if (saveToDB_) {
     edm::LogInfo("Alignment") << "Writing Alignments for run " << time << " to " << alignRcd << ".";
-    poolDb->writeOneIOV<Alignments>(tempAlignments, time, alignRcd);
+    poolDb->writeOneIOV<Alignments>(*tempAlignments, time, alignRcd);
+  } else {
+    delete tempAlignments;  // ...otherwise we have to delete, as promised!
   }
 
   if (saveApeToDB_) {
     edm::LogInfo("Alignment") << "Writing AlignmentErrorsExtended for run " << time << " to " << errRcd << ".";
-    poolDb->writeOneIOV<AlignmentErrorsExtended>(tempAlignmentErrorsExtended, time, errRcd);
+    poolDb->writeOneIOV<AlignmentErrorsExtended>(*tempAlignmentErrorsExtended, time, errRcd);
+  } else {
+    delete tempAlignmentErrorsExtended;  // ...otherwise we have to delete, as promised!
   }
 }