]> jspc29.x-matter.uni-frankfurt.de Git - mvdsensorcontrol.git/commitdiff
added new header in unpacker
authorJan Michel <j.michel@gsi.de>
Wed, 17 Sep 2014 16:50:14 +0000 (18:50 +0200)
committerJan Michel <j.michel@gsi.de>
Wed, 17 Sep 2014 16:50:14 +0000 (18:50 +0200)
tools/unpacker/unpacker.cxx

index 80f15d8b5439cf926ca7bdd65f88e29f629813d5..4f48620def4eb978c58e24a8655e2f39edf46540 100644 (file)
@@ -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;