---

yaml --- r: 123259 b: refs/heads/vhbbHeppy74X c: 59d1ac7 h: refs/heads/vhbbHeppy74X i: 123257: b95083f 123255: 403da25
cms-sw · Apr 29, 2013 · 10b59f6 · 10b59f6
1 parent 47ac9ec
commit 10b59f6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/vhbbHeppy74X: 911c0e9e55dff017172f3592154b0b696d1e6ddd
+refs/heads/vhbbHeppy74X: 59d1ac73bb1d7e904f99dca7406502d3c45c795f
diff --git a/trunk/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc b/trunk/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
@@ -216,44 +216,47 @@ namespace edm
 
    // ZDC next
 
-   Handle< ZDCDigiCollection > pZDCDigis;
+   if(DoZDC_){
 
-   const ZDCDigiCollection*  ZDCDigis = 0;
+     Handle< ZDCDigiCollection > pZDCDigis;
 
-   if( e.getByLabel( ZDCdigiCollectionSig_, pZDCDigis) ) {
-     ZDCDigis = pZDCDigis.product(); // get a ptr to the product
+     const ZDCDigiCollection*  ZDCDigis = 0;
+
+     if( e.getByLabel( ZDCdigiCollectionSig_, pZDCDigis) ) {
+       ZDCDigis = pZDCDigis.product(); // get a ptr to the product
 #ifdef DEBUG
-     LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();
+       LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();
 #endif
-   } 
+     } 
 
 
-   if (ZDCDigis)
-     {
-       // loop over digis, storing them in a map so we can add pileup later
-       for(ZDCDigiCollection::const_iterator it  = ZDCDigis->begin();	
-	   it != ZDCDigis->end(); ++it) {
-
-         // calibration, for future reference:  (same block for all Hcal types)                                
-         HcalDetId cell = it->id();
-         //         const HcalCalibrations& calibrations=conditions->getHcalCalibrations(cell);                
-         const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
-	 const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic         
-         HcalCoderDb coder (*channelCoder, *shape);
-
-         CaloSamples tool;
-         coder.adc2fC((*it),tool);
-
-	 ZDCDigiStorage_.insert(ZDCDigiMap::value_type( ( it->id() ), tool ));
+     if (ZDCDigis)
+       {
+	 // loop over digis, storing them in a map so we can add pileup later
+	 for(ZDCDigiCollection::const_iterator it  = ZDCDigis->begin();	
+	     it != ZDCDigis->end(); ++it) {
+
+	   // calibration, for future reference:  (same block for all Hcal types)                                
+	   HcalDetId cell = it->id();
+	   //         const HcalCalibrations& calibrations=conditions->getHcalCalibrations(cell);                
+	   const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
+	   const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic         
+	   HcalCoderDb coder (*channelCoder, *shape);
+
+	   CaloSamples tool;
+	   coder.adc2fC((*it),tool);
+
+	   ZDCDigiStorage_.insert(ZDCDigiMap::value_type( ( it->id() ), tool ));
 
 #ifdef DEBUG	 
-         LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with rawId: "
-				      << it->id() << "\n"
-				      << " digi energy: " << it->energy();
+	   LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with rawId: "
+						<< it->id() << "\n"
+						<< " digi energy: " << it->energy();
 #endif
 
+	 }
        }
-     }
+   }
 
   } // end of addHCalSignals