From 00535eefd82edc2de6668a9b37c9b017b76e7466 Mon Sep 17 00:00:00 2001 From: "www@jspc55" Date: Tue, 1 Jul 2014 16:12:39 +0200 Subject: [PATCH] Debugged --- tools/unpacker/unpacker.cxx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/unpacker/unpacker.cxx b/tools/unpacker/unpacker.cxx index e7df3d1..7e2d073 100644 --- a/tools/unpacker/unpacker.cxx +++ b/tools/unpacker/unpacker.cxx @@ -6,7 +6,7 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, uns unsigned getSensor(unsigned sensorId); void writeResults(); -#define DEBUG 0 +#define DEBUG 2 #define MAX_SENSORS 12 unsigned pixelMap[MAX_SENSORS][576][1152] = {{0}}; @@ -81,6 +81,7 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig if (source == 0x5555) return -32; if (datalen == 0) return -33; unsigned RocEnd = ix + datalen -1; + int v2 = 0; while(1) { unsigned sensorHead = sub->Data(ix++); unsigned sensorId = 0x0; @@ -101,6 +102,7 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig internal_fr_num = sub->Data(ix++); sensorError = 0x0; sensorDebug = 0x0; + v2 = 1; } else{ sensorId = (source << 16)|(sub->Data(ix++)>>16); @@ -108,6 +110,7 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig sensorError = sub->Data(ix++); sensorDebug = sub->Data(ix++); ix += 2; //Skip time + v2 = 0; } mySensor = getSensor(sensorId); @@ -160,8 +163,15 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig while(1) { for(unsigned i = 0; i<=1; i++) { - if(i==0) d = sub->Data(ix) >> 16; - else d = sub->Data(ix++); + + if (v2==1){ + if(i==0) d = (sub->Data(ix) << 16) >> 16; + else d = sub->Data(ix++) >> 16; + } + else{ + if(i==0) d = sub->Data(ix) >> 16; + else d = sub->Data(ix++); + } if(statecnt-- == 0) { ovf += (d >> 15) & 1; -- 2.43.0