cuco ok lol

devel/calYampSE1.R

@@ -49,6 +49,7 @@ if(a$cs == "SE1" & a$cpt$Type == "srg_error"){
     doc <- cuco.uncertPOffset(doc)
     doc <- cuco.uncertOffsetDrift(doc)
     doc <- cuco.uncertExpSd(doc)
+    doc <- cuco.uncertPrise(doc)
 }
 
 doc <- se1.uncertPcal(doc)

scripts/analyse_SE1_YAMP.R

 if(length(doc$Calibration) > 0){
+
     doc <- se1.calTime(doc)
     doc <- se1.calT(doc)
     doc <- se1.calPfill(doc)
     doc <- se1.calf(doc)
     doc <- se1.calRGC(doc)
     doc <- se1.calPcal(doc)
-    
+    doc <- se1.writePind(doc)
+
     doc <- se1.uncertPfill(doc)
     doc <- se1.uncertf(doc)
     doc <- se1.uncertdT(doc)
@@ -20,14 +22,19 @@ if(length(doc$Calibration) > 0){
     doc <- se1.uncertPres(doc)
     doc <- se1.uncertRep(doc)
 
-    ## ... customer calibration object (cuco) related
+    if(a$cs == "SE1" & a$cpt$Type == "srg_error"){
+        doc <- cuco.uncertVisc(doc)
+        doc <- cuco.uncertDigit(doc)
+        doc <- cuco.uncertPOffset(doc)
+        doc <- cuco.uncertOffsetDrift(doc)
+        doc <- cuco.uncertExpSd(doc)
+        doc <- cuco.uncertPrise(doc)
+    }
 
+    doc <- se1.uncertPcal(doc)
+    doc <- cuco.uncertPind(doc)
     
-    
-  
-    }
     doc <- se1.uncertTotal(doc)
-    
     ## misc
     doc <- writeRes(doc)
 }

uncert/cuco.uncertPind.R

@@ -28,7 +28,7 @@ cuco.uncertPind <- function(ccc){
         u4 <- getConstVal(a$cav$Uncertainty, "uncertOffset")
         u5 <- getConstVal(a$cav$Uncertainty, "uncertVisc")
         u6 <- getConstVal(a$cav$Uncertainty, "uncertPrise")
-        
+               
         uncertges <- sqrt(u1^2 +
                           u2^2 +
                           u3^2 +
@@ -37,6 +37,8 @@ cuco.uncertPind <- function(ccc){
                           u6^2)
     } ## se1 srg_error
 
+
+    
     ccc$Calibration$Analysis$Values$Uncertainty <-
         setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
                "uncertPind_rel",