Changeset 12831 for trunk/FACT++

Timestamp:

02/03/12 12:43:23 (13 years ago)

Author:

tbretz

Message:

Removed variables which were defined but never really used in any reasonable context

Location:

trunk/FACT++/src

Files:

• EventBuilder.c (modified) (11 diffs)
• EventBuilderWrapper.h (modified) (2 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -790 +790 @@
 //(and make sure multiple calls do no harm ....)
 
-   int headmem = 0;
+//   int headmem = 0;
    int evid;
-   size_t freemem = 0;
+//   size_t freemem = 0;
 
    evid = mBuffer[i].evNum;
-   freemem = mBuffer[i].evtLen;
+//   freemem = mBuffer[i].evtLen;
    //ETIENNE
    ETI_Free(evid, i);
@@ -807 +807 @@
    mBuffer[i].buffer = NULL;
 //END ETIENNE
-   headmem = NBOARDS * sizeof (PEVNT_HEADER);
+//   headmem = NBOARDS * sizeof (PEVNT_HEADER);
    mBuffer[i].evNum = mBuffer[i].nRoi = -1;
    mBuffer[i].runNum = 0;
@@ -884 +884 @@
    int32_t jrd;
    uint gi_SecTime;             //time in seconds
-   int boardId, roi[9], drs, px, src, pixS, pixH, pixC, pixR, tmS;
+   int boardId, roi[9], drs, px, src, pixS, /*pixH,*/ pixC, pixR, tmS;
 
    int goodhed = 0;
@@ -903 +903 @@
    factOut (kInfo, -1, str);
 
-   int cpu = 7;                 //read thread
+//   int cpu = 7;                 //read thread
 //   cpu_set_t mask;
 
@@ -909 +909 @@
 //   CPU_ZERO (&mask);
 /* CPU_SET sets only the bit corresponding to cpu. */
-   cpu = 7;
+//   cpu = 7;
 //   CPU_SET (cpu, &mask);
 
@@ -1272 +1272 @@
                   //get index into mBuffer for this event (create if needed)
 
-                  int actid;
-                  if (g_useFTM > 0)
-                     actid = rd[i].evtID;
-                  else
-                     actid = rd[i].ftmID;
+//                  int actid;
+//                  if (g_useFTM > 0)
+//                     actid = rd[i].evtID;
+//                  else
+//                     actid = rd[i].ftmID;
 
                   evID = mBufEvt (rd[i].evtID, rd[i].runID, roi, i,
@@ -1346 +1346 @@
                   for (px = 0; px < 9; px++) {  //different sort in FAD board.....
                      for (drs = 0; drs < 4; drs++) {
-                        pixH = rd[i].rBuf->S[src++];    // ID
+//                        pixH = rd[i].rBuf->S[src++];    // ID
                         pixC = rd[i].rBuf->S[src++];    // start-cell
                         pixR = rd[i].rBuf->S[src++];    // roi
@@ -1899 +1899 @@
 
    pthread_t thread[100];
-   int th_ret[100];
+//   int th_ret[100];
 
    for (long long k = 0; k < gi_maxProc; k++) {
-      th_ret[k] = pthread_create (&thread[k], NULL, subProc, (void *) k);
+      /*th_ret[k] =*/ pthread_create (&thread[k], NULL, subProc, (void *) k);
    }
 
@@ -2498 +2498 @@
 {
 
-   int i, j, imax, status, th_ret[50];
+   int i, /*j,*/ imax, status/*, th_ret[50]*/;
    pthread_t thread[50];
    struct timespec xwait;
@@ -2537 +2537 @@
 
    i = 0;
-   th_ret[i] = pthread_create (&thread[i], NULL, readFAD, NULL);
+   /*th_ret[i] =*/ pthread_create (&thread[i], NULL, readFAD, NULL);
    i++;
-   th_ret[i] = pthread_create (&thread[i], NULL, procEvt, NULL);
+   /*th_ret[i] =*/ pthread_create (&thread[i], NULL, procEvt, NULL);
    i++;
-   th_ret[i] = pthread_create (&thread[i], NULL, writeEvt, NULL);
+   /*th_ret[i] =*/ pthread_create (&thread[i], NULL, writeEvt, NULL);
    i++;
    imax = i;
@@ -2567 +2567 @@
 //wait for all threads to finish
    for (i = 0; i < imax; i++) {
-      j = pthread_join (thread[i], (void **) &status);
+      /*j =*/ pthread_join (thread[i], (void **) &status);
    }
 

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1131 +1131 @@
         array<T, 42> arr;
 
-        bool rc = true;
+        // bool rc = true;
         for (int i=0; i<40; i++)
         {
@@ -1158 +1158 @@
                 max = ref;
 
-            if (*val!=*ref)
-                rc = false;
+            // if (*val!=*ref)
+            //     rc = false;
         }