1.4.1 add salvataggio valore pulito

sampler/FTSampler.py

@@ -56,6 +56,8 @@ if redSrv0.get('SETTINGS:LOG:EXETIME') is None:
     redSrv0.set('SETTINGS:LOG:EXETIME', 1)
 if redSrv0.get('RTDATA:VALUE:SMOOTHED') is None:
     redSrv0.set('RTDATA:VALUE:SMOOTHED', 1)
+if redSrv0.get('RTDATA:VALUE:CLEAN') is None:
+    redSrv0.set('RTDATA:VALUE:CLEAN', 1)
 if redSrv0.get('RTDATA:VALUE:REAL') is None:
     redSrv0.set('RTDATA:VALUE:REAL', 1)
 if redSrv0.get('SETTINGS:POWER:THRESH') is None:
@@ -182,8 +184,10 @@ def calculateValue():
     den = abs(float(v1)-float(v2))
     if(den < 0.01):
         den = 0.01
+    # calcolo il valore risultante pulito (senza correzioni)
     XVal = (float(v2)/float(den))
-    # applicare costanti k1*x^2, k2*x e offset
+    redSrv0.set('RTDATA:VALUE:CLEAN',round(XVal,decimalsCount))
+    # applicare correzioni (costanti k1*x^2, k2*x e offset)
     newValue = (float(k1)*float(XVal)*float(XVal))+(float(k2)*float(XVal))+float(offset)
     redSrv0.set('RTDATA:VALUE:REAL',round(newValue,decimalsCount))
     strValIn = newValue
@@ -223,7 +227,7 @@ try:
         for counter in range(0,smoothFact,+1):
             # leggo gli 8 valori
             CHvalue = CH.ADS1256_GetAll()
-            floatArray = np.array(CHvalue, dtype=np.float)
+            floatArray = np.array(CHvalue, dtype=float)
             dataBox[counter] = floatArray*float(5.0/0x7fffff)
             # calcolo e scrittura ogni NUM PERIOD cicli
             if counter == (smoothFact-1):
@@ -241,8 +245,6 @@ try:
         delta = endExec - now
         # attesa viene fatta sempre
         waitTime = (int(sampleFreq)*smoothFact)/1000 - delta.microseconds/1000000
-        #redSrv0.set('SETTINGS:MONITOR:WAITIME',waitTime)
-        #redSrv0.set('SETTINGS:MONITOR:DELTATIME',str(delta.microseconds/1000))
         if(waitTime < 0.0):
             redSrv0.set('SETTINGS:WARNING:EXETIME',1)
         else: