---

yaml
---
r: 72703
b: "refs/heads/CMSSW_7_1_X"
c: 32ba894
h: "refs/heads/CMSSW_7_1_X"
i:
  72701: 39e0ce0
  72699: 8c07281
  72695: 2a31564
  72687: 97347f0
  72671: 3adeff5
  72639: 9e54d4c
  72575: 793cc57
  72447: a247dbf
  72191: 75764e2
  71679: deb2bad
v: v3

[refs]

@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 1c8f18e7ece26c2ce1336d9882a61836e3544b96
+"refs/heads/CMSSW_7_1_X": 32ba894ec1c5b6ee8dc62e88fff6a606b14e0869

trunk/EventFilter/EcalDigiToRaw/src/EcalDigiToRaw.cc

@@ -13,7 +13,7 @@
 //
 // Original Author:  Emmanuelle Perez
 //         Created:  Sat Nov 25 13:59:51 CET 2006
-// $Id: EcalDigiToRaw.cc,v 1.12 2009/05/29 14:36:39 franzoni Exp $
+// $Id: EcalDigiToRaw.cc,v 1.10 2009/02/17 16:29:40 muzaffar Exp $
 //
 //
 
@@ -58,7 +58,7 @@ EcalDigiToRaw::EcalDigiToRaw(const edm::ParameterSet& iConfig)
    doEndCap_ = iConfig.getUntrackedParameter<bool>("DoEndCap");
 
    listDCCId_ = iConfig.getUntrackedParameter< std::vector<int32_t> >("listDCCId");
-   dccFOV_ = iConfig.getParameter<int32_t>("dccFOV");
+
    label_= iConfig.getParameter<string>("Label");
    instanceNameEB_ = iConfig.getParameter<string>("InstanceEB");
    instanceNameEE_ = iConfig.getParameter<string>("InstanceEE");
@@ -117,14 +117,9 @@ EcalDigiToRaw::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
   runnumber_ = iEvent.id().run();
 
-  // bx_ = (counter_ % BXMAX);
-  // orbit_number_ = counter_ / BXMAX;
-  // counter_ ++;
-
-  counter_ = iEvent.id().event();
-  bx_ = iEvent.bunchCrossing();
-  orbit_number_ = iEvent.orbitNumber();
-
+  bx_ = (counter_ % BXMAX);
+  orbit_number_ = counter_ / BXMAX;
+  counter_ ++;
   lv1_ = counter_ % (0x1<<24);
 
   auto_ptr<FEDRawDataCollection> productRawData(new FEDRawDataCollection);
@@ -147,7 +142,6 @@ EcalDigiToRaw::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
      // iEvent.getByType(ecalTrigPrim);
 	iEvent.getByLabel(labelTT_, ecalTrigPrim);
 
-     // loop on TP's and add one by one to the block
      for (EcalTrigPrimDigiCollection::const_iterator it = ecalTrigPrim -> begin();
 			   it != ecalTrigPrim -> end(); it++) {
 
@@ -161,8 +155,7 @@ EcalDigiToRaw::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
            int FEDid = FEDNumbering::MINECALFEDID + iDCC;
 
            FEDRawData& rawdata = productRawData.get() -> FEDData(FEDid);
-
-	   // adding the primitive to the block
+
 	   TCCblockformatter_ -> DigiToRaw(trigprim, rawdata, TheMapping);
 
      }   // end loop on ecalTrigPrim