Changeset 18036 for trunk

Timestamp:

12/14/14 03:01:50 (10 years ago)

Author:

Daniela Dorner

Message:

updated limits when temperatures are set to 0 to 970 and 1300

File:

• trunk/FACT++/src/fscctrl.cc (modified) (3 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -68 +68 @@
         const double x = R/1000;
         return -193.804 + 96.0651*x + 134.673*x*x - 36.9091*x*x*x;
+
+        //for a reasonable range:
+        // R=970 -> -7.6 degC
+        // R=1300 -> 77.6 degC
 
         //const double R0 = 1000; // 1kOhm
@@ -274 +278 @@
 
         for (int *pt=mapt; *pt>=0; pt++)
-            temperatures.push_back(resist[*pt]>800&&resist[*pt]<2000 ? GetTempPT1000(resist[*pt]) : 0);
+            //temperatures.push_back(resist[*pt]>800&&resist[*pt]<2000 ? GetTempPT1000(resist[*pt]) : 0);
+            temperatures.push_back(resist[*pt]>970&&resist[*pt]<1300 ? GetTempPT1000(resist[*pt]) : 0);
 
         // 0 = 3-(3+0)%4
@@ -458 +463 @@
         {
             for (size_t i=0; i<resist.size(); i++)
-                if (resist[i]>800 && resist[i]<2000)
+                //if (resist[i]>800 && resist[i]<2000)
+                if (resist[i]>970 && resist[i]<1300)
                     Out() << setw(2) << i << " - " << setw(4) << (int)resist[i] << ": " << setprecision(1) << fixed << GetTempPT1000(resist[i]) << endl;
                 else