From: Jan Michel Date: Wed, 17 Sep 2014 16:50:14 +0000 (+0200) Subject: added new header in unpacker X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=620888e9cb866889b6ec894dba8d20fbccf1f420;p=mvdsensorcontrol.git added new header in unpacker --- diff --git a/tools/unpacker/unpacker.cxx b/tools/unpacker/unpacker.cxx index 80f15d8..4f48620 100644 --- a/tools/unpacker/unpacker.cxx +++ b/tools/unpacker/unpacker.cxx @@ -82,6 +82,16 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig if (datalen == 0) return -33; unsigned RocEnd = ix + datalen -1; int v2 = 0; + + unsigned rocHead = sub->Data(ix++); + if((rocHead>>24 & 0xFF) != 1 || rocHead & 0xFF != 1) { + return -37; + } + else { + unsigned externalTimer = sub->Data(ix++); + unsigned externalInput = (externalTimer&0x80000000)?1:0; + externalTimer &= 0x7FFFFFFF; + } while(1) { unsigned sensorHead = sub->Data(ix++); unsigned sensorId = 0x0;