From: www@jspc55 Date: Fri, 19 Sep 2014 11:44:17 +0000 (+0200) Subject: unpacker working with new header X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f754635f2a944be3428e694cb2cdd3ca5834d119;p=mvdsensorcontrol.git unpacker working with new header --- diff --git a/tools/unpacker/unpacker.cxx b/tools/unpacker/unpacker.cxx index 4f48620..d38bc23 100644 --- a/tools/unpacker/unpacker.cxx +++ b/tools/unpacker/unpacker.cxx @@ -13,6 +13,7 @@ unsigned pixelMap[MAX_SENSORS][576][1152] = {{0}}; unsigned pixelcount[MAX_SENSORS][1153] = {{0}}; unsigned statistics[MAX_SENSORS][4] = {{0}}; unsigned numSensors = 0; +unsigned countMarkedFrames = 0; unsigned sensors[MAX_SENSORS]; #define FRREALBROKEN 0 @@ -84,12 +85,13 @@ signed analyzeData(hadaq::RawSubevent* sub, unsigned ix, unsigned datalen, unsig int v2 = 0; unsigned rocHead = sub->Data(ix++); - if((rocHead>>24 & 0xFF) != 1 || rocHead & 0xFF != 1) { + if(((rocHead>>24) & 0xFF) != 1 || (rocHead & 0xFF) != 1) { return -37; } else { unsigned externalTimer = sub->Data(ix++); unsigned externalInput = (externalTimer&0x80000000)?1:0; + if(externalInput) countMarkedFrames++; externalTimer &= 0x7FFFFFFF; } while(1) { @@ -231,7 +233,7 @@ void writeResults() { printf ("===============\n"); printf ("== Summary ==\n"); printf ("===============\n"); - printf ("Sensor\t\tStates\t\tGood\tBroken\tInvalid\tBank0\t\tBank1\t\tBank2\t\tBank3\n"); + printf ("Sensor\t\tStates\t\tGood\tBroken\tInvalid\tMarked\tBank0\t\tBank1\t\tBank2\t\tBank3\n"); for(unsigned i = 0; i < numSensors; i++) { if(statistics[i][FRVALID] == 0) {continue;} double hitrates[4]; @@ -245,12 +247,13 @@ void writeResults() { } hitcount[i] = pixcolcnt[i][0] + pixcolcnt[i][1] + pixcolcnt[i][2] + pixcolcnt[i][3]; - printf("%08x\t%10i\t%i\t%i\t%i\t%10i\t%10i\t%10i\t%10i\n", + printf("%08x\t%10i\t%i\t%i\t%i\t%i\t%10i\t%10i\t%10i\t%10i\n", sensors[i], hitcount[i], statistics[i][FRVALID], statistics[i][FRBROKEN], statistics[i][FRREALBROKEN], + countMarkedFrames, pixcolcnt[i][0], pixcolcnt[i][1], pixcolcnt[i][2],