From 38cad5f55f0794bcc0f3c5d48efe0692704d6fc1 Mon Sep 17 00:00:00 2001
From: Robert Frazier <sha1-273486ace982b9e0b4eb051eb902f3dfb02026ef@cern.ch>
Date: Tue, 7 Apr 2009 11:06:06 +0000
Subject: [PATCH] --- yaml --- r: 64439 b: "refs/heads/CMSSW_7_1_X" c:
 e7f5810b037a1c47984b55ecd1a553ac7fbd918a h: "refs/heads/CMSSW_7_1_X" i:  
 64437: 2d087e467aecbc9e70dc951e4e4813cd679c9bb6   64435:
 42e275a25492b40d0552911f3aeb5c2c1fab5d77   64431:
 6701092877ffbadab5dd747d0c6dfc2a7f02ab20 v: v3

---
 [refs]                                                |  2 +-
 .../GctRawToDigi/src/GctFormatTranslateMCLegacy.cc    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 62051f46d493b..889a687bf70c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 82f76fd1a3f5d9423d7c163d852a0c36647fc4ea
-"refs/heads/CMSSW_7_1_X": 541059c11afa5d664b591762fc278040a3d52715
+"refs/heads/CMSSW_7_1_X": e7f5810b037a1c47984b55ecd1a553ac7fbd918a
diff --git a/trunk/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc b/trunk/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc
index e5dfeeda56db2..6e7df968a791e 100644
--- a/trunk/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc
+++ b/trunk/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.cc
@@ -12,6 +12,7 @@ using std::cout;
 using std::endl;
 using std::pair;
 using std::make_pair;
+using std::vector;
 
 // INITIALISE STATIC VARIABLES
 GctFormatTranslateMCLegacy::BlockLengthMap GctFormatTranslateMCLegacy::m_blockLength = GctFormatTranslateMCLegacy::BlockLengthMap();
@@ -336,18 +337,18 @@ void GctFormatTranslateMCLegacy::writeRctEmCandBlocks(unsigned char * d, const L
   // Now run the conversion
   for(unsigned c = 0 ; c < 18 ; ++c)
   {
-    srcCardRouting_.EMUtoSFP(emuToSfpData[c].eIsoRank, emuToSfpData[c].eIsoCardId, emuToSfpData[c].eIsoRegionId,
-                             emuToSfpData[c].eNonIsoRank, emuToSfpData[c].eNonIsoCardId, emuToSfpData[c].eNonIsoRegionId,
-                             emuToSfpData[c].mipBits, emuToSfpData[c].qBits, emuToSfpData[c].sfp);
+    srcCardRouting().EMUtoSFP(emuToSfpData[c].eIsoRank, emuToSfpData[c].eIsoCardId, emuToSfpData[c].eIsoRegionId,
+                              emuToSfpData[c].eNonIsoRank, emuToSfpData[c].eNonIsoCardId, emuToSfpData[c].eNonIsoRegionId,
+                              emuToSfpData[c].mipBits, emuToSfpData[c].qBits, emuToSfpData[c].sfp);
   }
   
   // Now pack up the data into the RAW format.
-  RctCrateMap::iterator blockStartCrateIter;
+  BlkToRctCrateMap::iterator blockStartCrateIter;
   for(blockStartCrateIter = rctCrate_.begin() ; blockStartCrateIter != rctCrate_.end() ; ++blockStartCrateIter)
   {
     unsigned blockId = blockStartCrateIter->first;
     unsigned startCrate = blockStartCrateIter->second;
-    unsigned blockLength_32bit = GctBlockHeaderV2(blockId, 1, 0, 0).length();
+    unsigned blockLength_32bit = blockLengthMap()[blockId];
     
     writeRawHeader(d, blockId, 1);
     d+=4; // move past header.