uncert se1 compl.

	geändert:   cal/se1.calf.R
	geändert:   devel/calYampSE1.R
	geändert:   uncert/se1.uncertAds.R
	neue Datei:   uncert/se1.uncertAtm.R
	neue Datei:   uncert/se1.uncertComb.R
	neue Datei:   uncert/se1.uncertGas.R
	neue Datei:   uncert/se1.uncertInh.R
	neue Datei:   uncert/se1.uncertPres.R
	neue Datei:   uncert/se1.uncertRep.R
	geändert:   uncert/se1.uncertRg.R
	neue Datei:   uncert/se1.uncertValve.R
	neue Datei:   uncert/se1.uncertVz.R

cal/se1.calf.R

 se1.calf <- function(ccc){
-  msg     <- "calculated by se1.calf()"
-  volUnit <- "cm^3" 
-  Vz      <- 0  
-  a       <- abbrevList(ccc)
+    msg     <- "calculated by se1.calf()"
+    volUnit <- "cm^3"
+    vz      <- 0
+    a       <- abbrevList(ccc)
 
-  ## -------------------- Zusatzvolumen aufaddieren  v 
-  for(i in 1:length(a$cma$Volume)){
-    
-    fromUnit <- a$cma$Volume[[i]]$Unit
+    ## -------------------- Zusatzvolumen aufaddieren  v
+    for(i in 1:length(a$cma$Volume)){
+        
+        fromUnit <- a$cma$Volume[[i]]$Unit
+        conv     <- getConvFactor(ccc,volUnit, fromUnit)
+        nV       <- getConstVal(NA,NA,a$cma$Volume[[i]])
+        lnV      <- length(nV) # nur die letzte Eingabe zählt
+        vz       <- vz + nV[lnV] * conv
+    }
+
+
+    ## -------------------- f gibts in yamp for free
+    f        <- getConstVal(a$cmv$Expansion, "ratio_uncorr")
+
+    Vz         <- rep(vz, length(f))
+
+    SV       <- getSubList(a$cmv$Expansion, "volume_start")
+    fromUnit <- SV$Unit
     conv     <- getConvFactor(ccc,volUnit, fromUnit)
-    msg      <- paste(msg, "used", conv, "to convert from",fromUnit, "to", volUnit)
-    
-    nV       <- getConstVal(NA,NA,a$cma$Volume[[i]])
-    lnV      <- length(nV) # nur die letzte Eingabe zählt
+
+    sV       <- getConstVal(NA,NA,SV)*conv
+
+    fp       <- 1/(1/f + Vz/sV)
+
     
-    Vz       <- Vz + nV[lnV] * conv
-  }
-
-  ## -------------------- f gibts in yamp for free
-  f        <- getConstVal(a$cmv$Expansion, "ratio_uncorr")
-  
-  SV       <- getSubList(a$cmv$Expansion, "volume_start")
-  fromUnit <- SV$Unit
-  conv     <- getConvFactor(ccc,volUnit, fromUnit)
-  
-  sV       <- getConstVal(NA,NA,SV)*conv
-  
-  fp       <- 1/(1/f + Vz/sV)
-  
     ccc$Calibration$Analysis$Values$Expansion <-
-      setCcl(ccc$Calibration$Analysis$Values$Expansion,
-             "corr",
-             "1",
-             fp,
-             msg)
-    
+        setCcl(ccc$Calibration$Analysis$Values$Expansion,
+               "corr",
+               "1",
+               fp,
+               msg)
+
+    ccc$Calibration$Analysis$Values$Volume <-
+        setCcl(ccc$Calibration$Analysis$Values$Volume,
+               "add",
+               volUnit,
+               Vz,
+               msg)
+    ccc$Calibration$Analysis$Values$Volume <-
+        setCcl(ccc$Calibration$Analysis$Values$Volume,
+               "start",
+               volUnit,
+               sV,
+               msg)
+
     return(ccc)
 
 }

devel/calYampSE1.R

@@ -34,6 +34,14 @@ doc <- se1.uncertdT(doc)
 doc <- se1.uncertT1(doc)
 doc <- se1.uncertRg(doc)
 doc <- se1.uncertAds(doc)
+doc <- se1.uncertVz(doc)
+doc <- se1.uncertGas(doc)
+doc <- se1.uncertAtm(doc)
+doc <- se1.uncertValve(doc)
+doc <- se1.uncertInh(doc)
+doc <- se1.uncertPres(doc)
+doc <- se1.uncertRep(doc)
+doc <- se1.uncertComb(doc)
 
 doc <- dispatchResCal( doc )
 

uncert/se1.uncertAds.R

 se1.uncertAds <- function(ccc){
-    msg   <- "calculated by  se1.uncertCorr()"
+    msg   <- "calculated by  se1.uncertAds()"
     a     <- abbrevList(ccc)
 
     pcal  <- getConstVal(a$cav, "cal") # in mbar

uncert/se1.uncertAtm.R

+se1.uncertAtm <- function(ccc){
+    msg   <- "calculated by  se1.uncertAtm()"
+    a     <- abbrevList(ccc)
+
+    f     <- getConstVal(a$cav$Expansion, "corr")
+    
+    F5    <- rep(1,length(f))
+    uf5   <- getConstVal(a$cms, "F5_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertAtm",
+               "1",
+               F5 * uf5,
+               msg)
+    return(ccc)
+}

uncert/se1.uncertComb.R

+se1.uncertComb <- function(ccc){
+    msg   <- "calculated by  se1.uncertComb()"
+    a     <- abbrevList(ccc)
+    
+    uc <- sqrt(
+        getConstVal(a$cav$Uncertainty, "uncertPfill")   ^2 +  
+        getConstVal(a$cav$Uncertainty, "uncertf")       ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertdT")      ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertT1")      ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertRg")      ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertAds")     ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertVz")      ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertGas")     ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertAtm")     ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertValve")   ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertPres")    ^2 + 
+        getConstVal(a$cav$Uncertainty, "uncertRep")     ^2 )
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertComb",
+               "1",		
+               uc,
+               paste(msg, "u(k=1)"))
+    return(ccc)
+}

uncert/se1.uncertGas.R

+se1.uncertGas <- function(ccc){
+    msg   <- "calculated by  se1.uncertV1()"
+    a     <- abbrevList(ccc)
+
+    f     <- getConstVal(a$cav$Expansion, "corr")
+    
+    F4    <- rep(1,length(f))
+    uf4   <- getConstVal(a$cms, "F4_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertGas",
+               "1",
+               F4 * uf4,
+               msg)
+    return(ccc)
+}

uncert/se1.uncertInh.R

+se1.uncertInh <- function(ccc){
+    msg   <- "calculated by  se1.uncertInh()"
+    a     <- abbrevList(ccc)
+
+    f     <- getConstVal(a$cav$Expansion, "corr")
+    
+    F7    <- rep(1,length(f))
+    uf7   <- getConstVal(a$cms, "F7_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertGas",
+               "1",
+               F7 * uf7,
+               msg)
+    return(ccc)
+}

uncert/se1.uncertPres.R

+se1.uncertPres <- function(ccc){
+    msg   <- "calculated by  se1.uncertPres()"
+    a     <- abbrevList(ccc)
+
+    pcal  <- getConstVal(a$cav$Pressure, "cal")
+    
+   
+    upres   <- getConstVal(a$cms, "pres_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertPres",
+               "1",
+               upres/pcal,
+               msg)
+    return(ccc)
+}

uncert/se1.uncertRep.R

+se1.uncertRep <- function(ccc){
+    msg   <- "calculated by  se1.uncertRep()"
+    a     <- abbrevList(ccc)
+    
+    f     <- getConstVal(a$cav$Expansion, "corr")
+    urep   <- getConstVal(a$cms, "rep_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertRep",
+               "1",		
+               rep(urep, length(f)),
+               msg)
+    return(ccc)
+}

uncert/se1.uncertRg.R

 se1.uncertRg <- function(ccc){
-    msg   <- "calculated by  se1.uncertCorr()"
+    msg   <- "calculated by  se1.uncertRg()"
     a     <- abbrevList(ccc)
 
 

uncert/se1.uncertValve.R

+se1.uncertValve <- function(ccc){
+    msg   <- "calculated by  se1.uncertValve()"
+    a     <- abbrevList(ccc)
+
+    f     <- getConstVal(a$cav$Expansion, "corr")
+    
+    F6    <- rep(1,length(f))
+    uf6   <- getConstVal(a$cms, "F6_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertValve",
+               "1",
+               F6 * uf6,
+               msg)
+    return(ccc)
+}

uncert/se1.uncertVz.R

+se1.uncertVz <- function(ccc){
+    msg   <- "calculated by  se1.uncertV1()"
+    a     <- abbrevList(ccc)
+
+    Vz    <- getConstVal(a$cav$Volume, "add")
+    Vs    <- getConstVal(a$cav$Volume, "start")
+    f     <- getConstVal(a$cav$Expansion, "corr")
+
+    ## Geichung 23 in QSE-SE1-98
+    F3   <- 1/(f*Vz/Vs + 1)
+    uf3  <- getConstVal(a$cms, "F3_u1")
+    
+    ccc$Calibration$Analysis$Values$Uncertainty <-
+        setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
+               "uncertVz",
+               "1",
+               F3 * uf3,
+               msg)
+    return(ccc)
+}
+