..

cal/fm3.conductance.r

@@ -10,7 +10,7 @@ fm3.conductance <- function(doc){
     fname  <- deparse(match.call()[[1]])
     msg    <- paste("calculated by", fname)
 
-    c.B    <- 0.99 ## Grenze Korrelation SZ
+    c.B    <- 0.9 ## Grenze Korrelation SZ
     d.B    <- 0.85 ## Grenze Korrelation Drift
     sz.border <- 3e-2 ## unterhalb wird kein sz entfernt
     t2mm   <- getConstVal(a$cs, "turn_2_mm")
@@ -87,29 +87,26 @@ fm3.conductance <- function(doc){
             deltaV  <- A * dh *  mm32l
 
 ### Conductance L = dV/dt
-
             
             dVdt <- mean(deltaV / deltat, na.rm = TRUE)
             l.dev <- abs((deltaV / deltat - dVdt) / dVdt)
             m.dev <- mean(l.dev, na.rm = TRUE)
 
             ## rm sz if dev > sz.border
-            if(m.dev > sz.border){
+            if(!is.na(m.dev) & m.dev > sz.border){
                 r <- which.max(l.dev)
                 deltaV[r] <- NA 
                 deltat[r] <- NA
-
                 dVdt <- mean(deltaV / deltat, na.rm = TRUE)
-
             }
+            ## print( deltaV / deltat /dVdt -1)            
 
-            
 ### Drift Korrektur dV/dt * (1 - m.D/m.SZ)
             ## wenn besser als d.B korreliert
             dcorr[j] <-  (1 - s.d[j]/s.m[j])
-            if(R.d[j] > d.B){
+            #if(R.d[j] > d.B){
             #   dVdt <-  dVdt * dcorr[j]
-            }
+            #}
 
 
             L[j]       <- dVdt

devel/ce3.r

@@ -28,13 +28,14 @@ cdb        <- cdbIni()
 ## cdb$id     <- "cal-2019-ce3-kk-75037_0001"
 ## cdb$id     <- "cal-2019-ce3-kk-75012_0001"
 ## cdb$id     <- "cal-2019-ce3-kk-75095_0001"
-cdb$id     <- "cal-2019-ce3-kk-75095_0001"
+## cdb$id     <- "cal-2019-ce3-kk-75095_0001"
+cdb$id     <- "cal-2020-ce3-kk-75005_0001"
 cdb$DBName <- "vl_db"
 
 doc        <- cdbGetDoc(cdb)$res
 
 a   <- abbrevList(doc)
-## doc <- cutValues(doc, 1:6)
+## doc <- cutValues(doc, 1:11)
 doc <- refreshAnalysis(doc)
 doc <- refreshResult(doc)
 doc <- fm3.pressure.fill(doc)

uncert/cuco.uncert_pressure_offset.r

@@ -28,7 +28,7 @@ cuco.uncert.pressure.offset <- function(ccc){
     }
     
     uoff <- u / pind
-
+    print(u)
     ## es gibt sd-Daten aus der Messung
     SdOff <- getSubList(a$cmv, "ind_offset")$SdValue
     N     <- getSubList(a$cmv, "ind_offset")$N