Skip to content
Snippets Groups Projects
Commit ad0f677e authored by Thomas Bock's avatar Thomas Bock :speech_balloon:
Browse files

rm bad sz

parent 89df473a
Branches
Tags v0.12.0
No related merge requests found
......@@ -60,8 +60,6 @@ fn.cdgb <- function(sl, prefix, sufix, x){
fm3.cdg.corr <- function(doc, p, prefix , sufix, border){
a <- abbrevList(doc)
i.dev <- which(p$fill < border$x1)
print(prefix)
print(i.dev)
if(length(i.dev) > 0){
if( prefix == "cdgbCorr") {
f <- fn.cdgb(a$cco, prefix, sufix, p$fill[i.dev])
......@@ -69,10 +67,6 @@ fm3.cdg.corr <- function(doc, p, prefix , sufix, border){
if( prefix == "cdgaCorr") {
f <- fn.cdga(a$cco, prefix, sufix, p$fill[i.dev])
}
print("öööööööööö")
print(p$fill[i.dev])
print(f)
print( 1. / (f + 1))
p$fill[i.dev] <- p$fill[i.dev] / (f + 1)
}
return(p)
......
......@@ -12,7 +12,7 @@ fm3.conductance <- function(doc){
c.B <- 0.99 ## 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")
ms2s <- getConstVal(a$cc, "ms_2_s")
mm32l <- getConstVal(a$cc, "mm^3_2_l")
......@@ -87,8 +87,23 @@ 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){
r <- which.max(l.dev)
deltaV[r] <- NA
deltat[r] <- NA
dVdt <- mean(deltaV / deltat, na.rm = TRUE)
}
### Drift Korrektur dV/dt * (1 - m.D/m.SZ)
## wenn besser als d.B korreliert
dcorr[j] <- (1 - s.d[j]/s.m[j])
......
......@@ -27,8 +27,8 @@ cdb <- cdbIni()
## cdb$id <- "cal-2018-ce3-kk-75085_0001"
## 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$DBName <- "vl_db"
doc <- cdbGetDoc(cdb)$res
......
......@@ -24,9 +24,12 @@ 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" ##
cdb$id <- "cal-2019-ce3-kk-75095_0002" ##
sigma.F13 <- 1.099
ind.conv <- 1.33322
## cdb$id <- "cal-2019-ce3-kk-75095_0002" ##
cdb$id <- "cal-2019-ce3-kk-75045_0002" ##
sigma.F13 <- 1.112
#ind.conv <- 1.33322
ind.conv <- 1
doc <- cdbGetDoc(cdb)$res
doc <- refreshAnalysis(doc)
doc <- refreshResult(doc)
......
......@@ -3,25 +3,27 @@ ce3.uncert.total.error <- function(ccc){
fname <- deparse(match.call()[[1]])
msg <- paste("calculated by", fname)
e <- getConstVal(a$cav$Error, "relative")
cf <- getConstVal(a$cav$CorrectionFactor, "correctionFactor")
pind <- getConstVal(a$cav$Pressure, "ind_corr")
pcal <- getConstVal(a$cav$Pressure, "cal")
u1 <- getConstVal(a$cav$Uncertainty, "uncertPcal_rel")
u2r <- getConstVal(a$cav$Uncertainty, "uncertPind_rel")
u2a <- getConstVal(a$cav$Uncertainty, "uncertPind_abs")
u2 <- getConstVal(a$cav$Uncertainty, "uncertPind_rel")
ue <- pind/pcal*sqrt(u1^2 + u2^2) ## (QM)
ucf <- pcal^2/pind^2 * ue
ccc$Calibration$Analysis$Values$Uncertainty <-
setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
"uncertTotal_cf",
"1",
sqrt(u1^2 + u2r^2) * cf,
ucf,
paste(msg, " (k=1)"))
ccc$Calibration$Analysis$Values$Uncertainty <-
setCcl(ccc$Calibration$Analysis$Values$Uncertainty,
"uncertTotal_e",
"1",
sqrt(u1^2 + (u2a/pind)^2) * 1/cf,
ue,
paste(msg, " (k=1)"))
return(ccc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment