Revert "introduced a sleep in init_system, so FPGAs have slightly more time to start...

This reverts commit d284744c0bee49a9ec04d70a240942ef1bb636a3.

I accidentally committed unstaged changes to unpacker.cxx

diff --git a/tools/init_system.pl b/tools/init_system.pl
index 2bb3c434b38a1c56265fe98b33855e0e83f4b44b..43e64a66ebe5ee6faa2a8683f10c89de2e38024a 100755 (executable)
--- a/tools/init_system.pl
+++ b/tools/init_system.pl
@@ -53,7 +53,7 @@ print("GBE:\t".join(", ", map {sprintf("%04x",$_)} @gbe)."\n");
  
 run("trbcmd reset");
 
-sleep 2;
+sleep 1;
 
 #Set addresses
 run(DAQTOOLSPATH."/tools/merge_serial_address.pl ".DAQTOOLSPATH."/base/serials_trb3.db ".CONFIGPATH."/network/addresses_trb3.db");

diff --git a/tools/unpacker/unpacker.cxx b/tools/unpacker/unpacker.cxx
index b756f59f1b0ae0971e44541c9daabc8c0321bbb1..fa7f919271f0900a585f9a68f3f2c14cd6cdefba 100644 (file)
--- a/tools/unpacker/unpacker.cxx
+++ b/tools/unpacker/unpacker.cxx
@@ -177,7 +177,6 @@ signed analyzeSubEvent(hadaq::RawSubevent* sub, unsigned pos, unsigned datalen,
         frame_timestamp = sub->Data(pdata++);
       }
       else if (dversion == 0x2){
-        v2 = 1;
         data = sub->Data(pdata);
         frame_id = (data & 0x000000ff);
         frame_id = (source << 16) | frame_id;
@@ -209,7 +208,7 @@ signed analyzeSubEvent(hadaq::RawSubevent* sub, unsigned pos, unsigned datalen,
 #endif    
 
   if (sub->Data(pdata) != 0x55555555) {
-    //printf("ERROR: Sensor Header (0x55555555) Not Found! (got: %08x)\n",sub->Data(pdata));
+    printf("ERROR: Sensor Header (0x55555555) Not Found! (got: %08x)\n",sub->Data(pdata));
     return -1;
   }
   
@@ -218,7 +217,7 @@ signed analyzeSubEvent(hadaq::RawSubevent* sub, unsigned pos, unsigned datalen,
     sensorIsValid = 1;
     //statistics[mySensor][FRVALID]++;
   }
-  else if(frame_status == 0x0f) {  // New Format, DVERSION 0x2+
+  else if(frame_status == 0xff) {  // New Format, DVERSION 0x2+
     sensorIsValid = 1;
     //statistics[mySensor][FRVALID]++;
   }
@@ -227,7 +226,7 @@ signed analyzeSubEvent(hadaq::RawSubevent* sub, unsigned pos, unsigned datalen,
     statistics[mySensor][FRBROKEN]++;
   }
 
-  if(sensorIsValid && frame_length>0x0){
+  if(sensorIsValid){
     //Hey Sensor, tell me who you are!
     pdata++;
     unsigned sensorNumber = sub->Data(pdata++);