Changeset 11539

Timestamp:

07/22/11 13:05:21 (13 years ago)

Author:

tbretz

Message:

Another fix to fix the min/max temperatures

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (2 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1728 +1728 @@
             const array<int16_t,42> tmp[4] =
             {
-                Compare(&h, &h.fTempDrs[0]),
-                Compare(&h, &h.fTempDrs[1]),
-                Compare(&h, &h.fTempDrs[2]),
-                Compare(&h, &h.fTempDrs[3])
+                Compare(&h, &h.fTempDrs[0]),    // 0-39:val, 40:min, 41:max
+                Compare(&h, &h.fTempDrs[1]),    // 0-39:val, 40:min, 41:max
+                Compare(&h, &h.fTempDrs[2]),    // 0-39:val, 40:min, 41:max
+                Compare(&h, &h.fTempDrs[3])     // 0-39:val, 40:min, 41:max
             };
 
             vector<int16_t> data;
             data.reserve(82);
-            data.push_back(tmp[0][0]);
-            data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42);
-            data.push_back(tmp[0][1]);
-            data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42);
+            data.push_back(tmp[0][40]);                                 // min: 0
+            data.insert(data.end(), tmp[0].data(), tmp[0].data()+40);   // val: 1-40
+            data.push_back(tmp[0][41]);                                 // max: 41
+            data.insert(data.end(), tmp[0].data(), tmp[0].data()+40);   // val: 42-81
 
             for (int j=0; j<=3; j++)
@@ -1746 +1746 @@
 
                 // Gloabl min
-                if (ref[40]<data[0])
+                if (ref[40]<data[0])           // 40=min
                     data[0] = ref[40];
 
                 // Global max
-                if (ref[41]>data[40])
+                if (ref[41]>data[40])          // 41=max
                     data[40] = ref[41];
 
-                for (int i=0; i<40; i++)
+                for (int i=0; i<40; i++)       
                 {
                     // min per board
-                    if (ref[i]<data[j+1])
-                        data[j+1] = ref[i];
+                    if (ref[i]<data[i+1])      // data:  1-40
+                        data[i+1] = ref[i];    // ref:   0-39
 
                     // max per board
-                    if (ref[i]>data[j+41])
-                        data[j+41] = ref[i];
+                    if (ref[i]>data[i+42])     // data: 42-81
+                        data[i+42] = ref[i];   // ref:   0-39
                 }
             }
 
-            vector<float> deg(82);
-            for (int i=0; i<82; i++)
+            vector<float> deg(82);              //  0: global min,  1-40: min
+            for (int i=0; i<82; i++)            // 41: global max, 42-81: max
                 deg[i] = data[i]/16.;
             fDimTemperature.Update(deg);