return an falscher Stelle

scripts/analyse_CE3.R

-if(length(doc$Calibration) > 0){
-  
-  doc <- refreshAnalysis(cdb,doc)
- 
-  doc <- ce3.calT(doc)
-  doc <- ce3.calPfill(doc)
-  doc <- ce3.calDvC(doc)
-  doc <- ce3.calQ(doc)
-  doc <- ce3.calMfp(doc)
-  doc <- ce3.writePind(doc)
-  doc <- ce3.calPcal(doc)
-  doc <- dispatchResCal(doc)
-  
-  
-  doc <- fm3.uncertPfill(doc)
-  doc <- fm3.uncertDPfill(doc)
-  doc <- fm3.uncertDeltaV(doc)
-  doc <- fm3.uncertDeltaVDeltat(doc)
-  doc <- fm3.uncertDeltat(doc)
-  doc <- fm3.uncertFmol(doc)
-  doc <- fm3.uncertqpV(doc)
-  doc <- fm3.uncertCmol(doc)
-  
-  doc <- ce3.uncertCx(doc)
-  doc <- ce3.uncertQsplit(doc)
-  doc <- ce3.uncertTfm(doc)
-  doc <- ce3.uncertTch(doc)
-  doc <- ce3.uncertF(doc)
-  doc <- ce3.uncertPcal(doc)
-  
-}

scripts/analyse_CE3_YAMP.R

@@ -51,6 +51,6 @@ if(length(doc$Calibration) > 0){
 
     doc <- dispatchResCal(doc)
     doc <- dispatchResSum(doc)
-
+#
     doc <- ce3.compareCDGs(doc)   
 }

utils/abbrevList.R

@@ -6,7 +6,7 @@ abbrevList <- function(ccc){
   a$dataAvailable <- FALSE
 
   a$c        <- ccc$Calibration
-  a$cs       <- ccc$Calibration$Standard
+  a$cs       <- a$c$Standard
   a$ct       <- a$c$Type
   a$cy       <- a$c$Year
   a$csi      <- a$c$Sign
@@ -19,7 +19,7 @@ abbrevList <- function(ccc){
   a$cma      <- a$cm$AuxValues ## seit 4/11
   a$cmco     <- a$cm$CalibrationObject
   a$cmco1    <- a$cm$CalibrationObject[[1]] ## customer device
-  
+
 ### hier noch die Co[2...N] explizit trennen
 
 ### ce3-spezifisch

utils/dispatchResSum.R

@@ -2,30 +2,30 @@ dispatchResSum <- function( ccc ){
     msg <- "set by writeRes"
     ## - data reduction as given by ToDo
     ## - round
-    
+
     a     <- abbrevList(ccc)
     pcal  <- getConstVal(a$cav$Pressure, "cal")
+
     
-    if(length(a$cp)                         > 0 &
-       length(a$cpt)                        > 0 &
-       length(a$cpt$Values$Pressure)        > 0 &
-       length(a$cpt$Values$Pressure$Value)  > 0 &
-       length(pcal)                         > 3){
-        
-        reType  <- a$cpt$Type
-        
-        if(reType =="srg_error"){
-            ccc <- resSrgError(ccc)
-        }
-        
-        if(reType =="error"){
-            ccc <- resError(ccc)
-        }
-        
-        if(reType =="sens"){
-            ccc <- resSens(ccc)
-        }
-        
-        return(ccc)
-    }
+   if(length(a$cp)                         > 0 &
+      length(a$cpt)                        > 0 &
+      length(a$cpt$Values$Pressure)        > 0 &
+      length(a$cpt$Values$Pressure$Value)  > 0 &
+      length(pcal)                         > 3){
+       
+       reType  <- a$cpt$Type
+       
+       if(reType =="srg_error"){
+           ccc <- resSrgError(ccc)
+       }
+       
+       if(reType =="error"){
+           ccc <- resError(ccc)
+       }
+       
+       if(reType =="sens"){
+           ccc <- resSens(ccc)
+       }
+   }
+       return(ccc)
 }