Changeset 12485 for trunk/FACT++

Timestamp:

11/10/11 04:33:09 (13 years ago)

Author:

lyard

Message:

Extreme memory swapping

File:

• trunk/FACT++/src/EventBuilder.c (modified) (8 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -1109 +1109 @@
                         maxread, MSG_DONTWAIT);
 //                      rd[i].bufLen, MSG_DONTWAIT);
-
                if (jrd > 0) {
                   debugStream (i, &rd[i].rBuf->B[rd[i].bufPos], jrd);
@@ -1226 +1225 @@
 */
                  //we have a complete buffer, copy to WORK area
+
+
+                  //End of the header. to channels now
+                  int eCount = 0;
+                  int eStart = 36;
+                  int ePatchesCount = 0;
+                  int currentRoi;
+                  for (;ePatchesCount<4*9;ePatchesCount++)
+                  {
+                      rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//id
+                      eCount++;
+                      rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//start_cell
+                      eCount++;
+                      rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//roi
+                      currentRoi = rd[i].rBuf->S[eStart+eCount];
+                      eCount++;
+                      rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//filling
+                      eCount++;
+                      eCount+=currentRoi;//skip the pixel data
+                  }
+        //                        snprintf(str, MXSTR, "Swapped %d bytes", eCount*2);
+        //                        factOut(kError, 000, str);
+
+                  //channels done. footer now
+   //               rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//package_crc
+   //               eCount++;
+   //               rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//end_package_flag
+   //               snprintf(str, MXSTR, "Bytes read %d bytes swapped %d", jrd, eCount*2);
+   //               factOut(kInfo, 000, str);
+                  //ETIENNE end of bytes swapping already
+
+
                   int jr, kr;
                   int  checkRoi;
                   int roiHopper = head_len/2 + 2; //points to the very first roi
-                  roi[0] = ntohs (rd[i].rBuf->S[roiHopper]);
+                  roi[0] = rd[i].rBuf->S[roiHopper];
                   roiHopper += roi[0]+4;//skip to the second roi (i.e. next board, same patch-pixel)
                   for (kr = 1; kr < 4; kr++)
                   {
-                      checkRoi = ntohs(rd[i].rBuf->S[roiHopper]);
+                      checkRoi = rd[i].rBuf->S[roiHopper];
                       if (checkRoi != roi[0])
                       {
@@ -1244 +1275 @@
                   //roiHopper now points to the first pixel of board 2. Do the 8 remaining pixels
                   for (jr = 1; jr < 9; jr++) {
-                     roi[jr] = ntohs(rd[i].rBuf->S[roiHopper]);
+                     roi[jr] = rd[i].rBuf->S[roiHopper];
                      checkRoi = roi[jr];
                      for (kr = 1; kr < 4; kr++)
                      {
                          roiHopper += checkRoi+4;
-                         checkRoi = ntohs(rd[i].rBuf->S[roiHopper]);
+                         checkRoi = rd[i].rBuf->S[roiHopper];
                          if (checkRoi != roi[jr])
                          {
@@ -1307 +1338 @@
                   int qncpy = 0;
                   boardId = b;
-                  int fadBoard = ntohs (rd[i].rBuf->S[12]);
+                  int fadBoard = rd[i].rBuf->S[12];
                   int fadCrate = fadBoard / 256;
                   if (boardId != (fadCrate * 10 + fadBoard % 256)) {
@@ -1334 +1365 @@
                   for (px = 0; px < 9; px++) {  //different sort in FAD board.....
                      for (drs = 0; drs < 4; drs++) {
-                        pixH = ntohs (rd[i].rBuf->S[src++]);    // ID
-                        pixC = ntohs (rd[i].rBuf->S[src++]);    // start-cell
-                        pixR = ntohs (rd[i].rBuf->S[src++]);    // roi
+                        pixH = rd[i].rBuf->S[src++];    // ID
+                        pixC = rd[i].rBuf->S[src++];    // start-cell
+                        pixR = rd[i].rBuf->S[src++];    // roi
 //here we should check if pixH is correct ....
 
@@ -1449 +1480 @@
                      }
                      goodhed++;
-                     rd[i].fadLen = ntohs (rd[i].rBuf->S[1]) * 2;
-                     rd[i].fadVers = ntohs (rd[i].rBuf->S[2]);
-                     rd[i].ftmTyp = ntohs (rd[i].rBuf->S[5]);
-                     rd[i].ftmID = ntohl (rd[i].rBuf->I[3]);    //(FTMevt)
-                     rd[i].evtID = ntohl (rd[i].rBuf->I[4]);    //(FADevt)
-                     rd[i].runID = ntohl (rd[i].rBuf->I[11]);
+                     //ETIENNE swap the header bytes already
+                     int eStart = 0;
+                     rd[i].rBuf->S[eStart+0] = ntohs(rd[i].rBuf->S[eStart+0]);//start_package_flag
+                     rd[i].rBuf->S[eStart+1] = ntohs(rd[i].rBuf->S[eStart+1]);//package_length
+                     rd[i].rBuf->S[eStart+2] = ntohs(rd[i].rBuf->S[eStart+2]);//version_no
+                     rd[i].rBuf->S[eStart+3] = ntohs(rd[i].rBuf->S[eStart+3]);//PLLLCK
+                     rd[i].rBuf->S[eStart+4] = ntohs(rd[i].rBuf->S[eStart+4]);//trigger_crc
+                     rd[i].rBuf->S[eStart+5] = ntohs(rd[i].rBuf->S[eStart+5]);//trigger_type
+                     rd[i].rBuf->I[eStart+3] = ntohl(rd[i].rBuf->I[eStart+3]);//trigger_id
+                     rd[i].rBuf->I[eStart+4] = ntohl(rd[i].rBuf->I[eStart+4]);//fad_evt_counter
+                     rd[i].rBuf->I[eStart+5] = ntohl(rd[i].rBuf->I[eStart+5]);//REFCLK_frequency
+                    rd[i].rBuf->S[eStart+12] = ntohs(rd[i].rBuf->S[eStart+12]);//board_id
+                     rd[i].rBuf->S[eStart+14] = ntohs(rd[i].rBuf->S[eStart+14]);//number_of_triggers_to_generate
+                     rd[i].rBuf->S[eStart+15] = ntohs(rd[i].rBuf->S[eStart+15]);//trigger_generator_prescaler
+                   //  int eInter = ntohl(rd[i].rBuf->I[eStart+8]);//DNA
+                    // rd[i].rBuf->I[eStart+8] = ntohl(rd[i].rBuf->I[eStart+9]);
+                     //rd[i].rBuf->I[eStart+9] = eInter;
+                     rd[i].rBuf->I[eStart+10] = ntohl(rd[i].rBuf->I[eStart+10]);//time
+                     rd[i].rBuf->I[eStart+11] = ntohl(rd[i].rBuf->I[eStart+11]);//runnumber;
+                     int eCount = 24;
+                     for (;eCount<24+NTemp;eCount++)
+                         rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//drs_temperature
+                     for (; eCount < 24+NTemp+NDAC; eCount++)
+                         rd[i].rBuf->S[eStart+eCount] = ntohs(rd[i].rBuf->S[eStart+eCount]);//dac
+
+
+ //                    rd[i].fadLen = rd[i].rBuf->S[1] * 2;
+//                                       snprintf(str, MXSTR, "Size of the fad buffer: %d", rd[i].fadLen);
+//                                       factOut(kError, 000, str);
+                                         
+                     rd[i].fadVers = rd[i].rBuf->S[2];
+                     rd[i].ftmTyp = rd[i].rBuf->S[5];
+                     rd[i].ftmID = rd[i].rBuf->I[3];    //(FTMevt)
+                     rd[i].evtID = rd[i].rBuf->I[4];    //(FADevt)
+                     rd[i].runID = rd[i].rBuf->I[11];
                      rd[i].bufTyp = 1;  //ready to read full record
                      rd[i].bufLen = rd[i].fadLen - rd[i].bufPos;
 
-                     int fadboard = ntohs (rd[i].rBuf->S[12]);
+                     int fadboard = rd[i].rBuf->S[12];
                      int fadcrate = fadboard / 256;
                      fadboard = (fadcrate * 10 + fadboard % 256);
@@ -1478 +1538 @@
                         rd[i].bufLen = 100000;  //?
                      }
-                     int fadBoard = ntohs (rd[i].rBuf->S[12]);
+                     int fadBoard = rd[i].rBuf->S[12];
                      debugHead (i, fadBoard, rd[i].rBuf);
                      debugRead (i, jrd, rd[i].evtID, rd[i].ftmID, rd[i].runID, -1, tsec, tusec);        // i=socket; jrd=#bytes; ievt=eventid;-1=start event
@@ -2021 +2081 @@
                      } else {
                         mBuffer[id].fEvent->BoardTime[ib] =
-                           ntohl (mBuffer[id].FADhead[ib].time);
+                           mBuffer[id].FADhead[ib].time;
                      }
                   }