Merge pull request #19 from dildick/from-CMSSW_6_2_X_SLHC_2014-01-24-…

…0200 Use shared_ptr
cms-sw · Jan 26, 2014 · 93ebd6e · 93ebd6e
2 parents cea35e1 + 3cfbdbb
commit 93ebd6e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc b/L1Trigger/CSCTriggerPrimitives/plugins/CSCTriggerPrimitivesProducer.cc
@@ -142,13 +142,13 @@ void CSCTriggerPrimitivesProducer::produce(edm::Event& ev,
       << " Skipping production of CSC TP digis +++\n";
   }
   // Fill output collections if valid input collections are available.
-  if (wireDigis.isValid() && compDigis.isValid()) {   
-    const CSCBadChambers* temp = checkBadChambers_ ? pBadChambers.product() : new CSCBadChambers;
-    lctBuilder_->build(temp,
-		       wireDigis.product(), compDigis.product(), gemPads,
-		       *oc_alct, *oc_clct, *oc_pretrig, *oc_lct, *oc_sorted_lct);
-    if (!checkBadChambers_)
-      delete temp;
+  if (wireDigis.isValid() && compDigis.isValid()) {
+    std::shared_ptr<const CSCBadChambers> temp( checkBadChambers_ ?
+                                                std::shared_ptr<const CSCBadChambers>{pBadChambers.product(), [](const void*){}} :
+                                                std::make_shared<const CSCBadChambers>());
+    lctBuilder_->build(temp.get(),
+                       wireDigis.product(), compDigis.product(), gemPads,
+                       *oc_alct, *oc_clct, *oc_pretrig, *oc_lct, *oc_sorted_lct);
   }
 
   // Put collections in event.