sz tests

cal/fm3.sz_params.r

@@ -22,10 +22,11 @@ fm3.szparam <- function(L){
 	##  } else if (L$p.target > 3e-6 ) {
         ##     dh <- 0.00025
 	##  } else
+	
 	if (L$p.target > 8e-7 ) {
            dh <- 0.00027
 	} else {
-	   dh <- 0.00144 
+	   dh <- 0.0015 
 	}
 
 ### pressure increment per turn
@@ -43,7 +44,7 @@ fm3.szparam <- function(L){
 
 ### idea to test:
 ### dead time (switch between tasks
-        t.dead  <- 1000
+        t.dead  <- 300
 	dp.dead <- L$dp.decr *	t.dead
 	h.dead  <- abs(dp.dead / p.incr)
 
@@ -64,7 +65,7 @@ fm3.szparam <- function(L){
         res[["Pressure_incr"]]$Unit     <- "mbar/turn"
 	res[["Displacer_single"]]$Value <- h
         res[["Displacer_single"]]$Unit  <- "turn"
-        res[["Time_single"]]$Value      <-  L$t.wait 
+        res[["Time_single"]]$Value      <- L$t.wait 
         res[["Time_single"]]$Unit       <- "ms"
 	res[["Sz_repeat"]]$Value        <- n.all
         res[["Sz_repeat"]]$Unit         <- "1"	

devel/srg_vg.r

@@ -24,16 +24,21 @@ pUnit  <- "mbar"
 ## cdb$id <- "cal-2019-ce3-kk-75037_0002" ## 
 ## cdb$id <- "cal-2019-ce3-kk-75012_0002" ##
 ## cdb$id <- "cal-2019-ce3-kk-75041_0002" ##
-<<<<<<< HEAD
-cdb$id <- "cal-2019-ce3-kk-75095_0002" ##
-sigma.F13 <- 1.099
-=======
 ## cdb$id <- "cal-2019-ce3-kk-75095_0002" ##
-cdb$id <- "cal-2019-ce3-kk-75045_0002" ##
-sigma.F13 <- 1.112
+## cdb$id <- "cal-2019-ce3-kk-75045_0002" ##
+## cdb$id <- "cal-2019-ce3-kk-75095_0002" ##
+cdb$id <- "cal-2020-ce3-kk-75043_0002" ##
+sigma.F13 <- mean(c(0.1009608,
+            0.09738324,
+            0.09941006,
+            0.1016098,
+            0.1021479,
+            0.1029383)+1)
+
+
                                         #ind.conv <- 1.33322
 ind.conv <- 1
->>>>>>> a93b663efd7670ce2d7405fe95c3c5feb6f3efc2
+
 
 doc    <- cdbGetDoc(cdb)$res
 doc    <- refreshAnalysis(doc)
@@ -182,5 +187,5 @@ doc$Calibration$Analysis$Values$Uncertainty <-
 doc <- ce3.uncert.total(doc)
 doc <- results(doc)
 
-## cdb$dataList <- doc
-## res <- cdbUpdateDoc(cdb)$res
+ cdb$dataList <- doc
+ res <- cdbUpdateDoc(cdb)$res

scripts/ce3.calibration_pressure.r

@@ -60,14 +60,14 @@ for(i in 1:length(ids)){
         doc <- ce3.uncert.pressure.cal(doc)
         #
         #     ## ... customer calibration object (cuco) related
-         doc <- cuco.uncert.digit(doc)
-         doc <- cuco.uncert.pressure.offset(doc)
-         doc <- cuco.uncert.drift.offset(doc)
-         doc <- cuco.uncert.sync(doc)
-         doc <- cuco.uncert.stdev(doc)
-         doc <- cuco.uncert.purity(doc)
-         doc <- cuco.uncert.emis(doc)
-         doc <- cuco.uncert.pressure.ind(doc)
+##          doc <- cuco.uncert.digit(doc)
+##          doc <- cuco.uncert.pressure.offset(doc)
+##          doc <- cuco.uncert.drift.offset(doc)
+##          doc <- cuco.uncert.sync(doc)
+##          doc <- cuco.uncert.stdev(doc)
+##          doc <- cuco.uncert.purity(doc)
+##          doc <- cuco.uncert.emis(doc)
+##          doc <- cuco.uncert.pressure.ind(doc)
 
 
        if(length(a$ct) > 0){