Skip to content
Snippets Groups Projects
Commit 9fb5c3db authored by wactbprot's avatar wactbprot
Browse files

start with frs-dkm vg

parent 74609be8
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ dkm.calPdkm <- function(ccc){ ...@@ -9,7 +9,7 @@ dkm.calPdkm <- function(ccc){
PNOM <- getSubList(a$cmv$Pressure, "dkm_nom") PNOM <- getSubList(a$cmv$Pressure, "dkm_nom")
PRES <- getSubList(a$cmv$Pressure, "dkm_res") PRES <- getSubList(a$cmv$Pressure, "dkm_res")
TDKM <- getSubList(a$cmv$Temperature, "keithley_ch108") TDKM <- getSubList(a$cmv$Temperature, "dkm")
SYSTCHAN <- getSubList(a$cms,"system_change") SYSTCHAN <- getSubList(a$cms,"system_change")
...@@ -45,14 +45,14 @@ dkm.calPdkm <- function(ccc){ ...@@ -45,14 +45,14 @@ dkm.calPdkm <- function(ccc){
ip1 <- which(pnom <= systChange) # system1 bis 300mbar ip1 <- which(pnom <= systChange) # system1 bis 300mbar
ip2 <- which(pnom > systChange) # system2 ab 300mbar ip2 <- which(pnom > systChange) # system2 ab 300mbar
if(length(ip1) >0){ if(length(ip1) > 0){
mSystVec[ip1] <- mSyst1 mSystVec[ip1] <- mSyst1
Avec[ip1] <- ASyst1 Avec[ip1] <- ASyst1
} }
if(length(ip2) >0){ if(length(ip2) > 0){
mSystVec[ip2] <- mSyst2 mSystVec[ip2] <- mSyst2
Avec[ip2] <- ASyst2 Avec[ip2] <- ASyst2
} }
noOfPnom <- length(pnom) noOfPnom <- length(pnom)
......
...@@ -5,7 +5,7 @@ library(R4CouchDB, ...@@ -5,7 +5,7 @@ library(R4CouchDB,
cdb <- cdbIni() cdb <- cdbIni()
cdb$id <- "c57a5943a80348e1e6489e68fc03e95d" cdb$id <- "c57a5943a80348e1e6489e68fc03e95d"
cdb$DBName <- "vaclab_db" cdb$DBName <- "mp_db"
## ---------------- ## ----------------
srcPath <- "../utils/" srcPath <- "../utils/"
...@@ -26,7 +26,6 @@ ccc <- cdbGetDoc(cdb)$res ...@@ -26,7 +26,6 @@ ccc <- cdbGetDoc(cdb)$res
if(length(ccc$Calibration) > 0){ if(length(ccc$Calibration) > 0){
ccc <- refreshAnalysis(cdb,ccc) ccc <- refreshAnalysis(cdb,ccc)
ccc <- getOutIndex(ccc)
ccc <- dkm.calPdkm(ccc) ccc <- dkm.calPdkm(ccc)
ccc <- frs5.calPfrs5(ccc) ccc <- frs5.calPfrs5(ccc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment