From fc0c2252d74dcf4ec57623044fe52d995bb451be Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Tue, 14 Jul 2015 17:43:53 +0200 Subject: [PATCH] replace struct C0_data with C0_header --- s-curves/cpp_based-on-dabc-lib/unpacker.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/s-curves/cpp_based-on-dabc-lib/unpacker.cxx b/s-curves/cpp_based-on-dabc-lib/unpacker.cxx index ccbf82a..5b257bd 100644 --- a/s-curves/cpp_based-on-dabc-lib/unpacker.cxx +++ b/s-curves/cpp_based-on-dabc-lib/unpacker.cxx @@ -111,7 +111,7 @@ void readSubEvents(hadaq::RawEvent* evnt) { } } -struct C0_data { +struct C0_header { // will usually occupy X bytes // word 1 / Header unsigned frame_length : 16; @@ -122,12 +122,12 @@ struct C0_data { unsigned row : 12; unsigned run_number : 8; // words 3 - 38 / Sensor Data - uint32_t data[36]; + //uint32_t data[36]; }; signed analyze_C0(hadaq::RawSubevent* sub, unsigned ix, unsigned framelen, unsigned source) { - C0_data sf; // scurve frame + C0_header sf; // scurve frame unsigned header_1 = sub->Data(ix++); sf.frame_length = header_1 >> 16; @@ -174,7 +174,7 @@ signed analyze_C0(hadaq::RawSubevent* sub, unsigned ix, unsigned framelen, unsig unsigned j; for (j = 0; ix + j < ix + 0x25; j++) { unsigned d = sub->Data(ix+j); - sf.data[j] = d; + //sf.data[j] = d; //////loop over all bits, optimized for all-set and all-clear states unsigned start = 1152 * sf.row + j*0x20; if(d == 0) {} -- 2.43.0