From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Tue, 10 Mar 2015 20:37:26 +0000 (+0100)
Subject: Fix decoding of current and power for the older ChemStation file format
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=1ca40f30ddb1bf5fe218d220dea958cde4fc99d9;p=libHPCS.git

Fix decoding of current and power for the older ChemStation file format
---

diff --git a/libhpcs.c b/libhpcs.c
index 302dc44..24a567b 100644
--- a/libhpcs.c
+++ b/libhpcs.c
@@ -242,7 +242,7 @@ static HPCS_step guess_current_step(const struct HPCS_MeasuredData* mdata)
 	if (strcmp(mdata->cs_ver, CHEMSTAT_VER_B0625) == 0)
 		return CE_CURRENT_STEP;
 
-	return CE_WORK_PARAM_STEP;
+	return CE_WORK_PARAM_OLD_STEP * 10.0;
 }
 
 static HPCS_step guess_elec_sigstep(const struct HPCS_MeasuredData* mdata)
diff --git a/libhpcs_p.h b/libhpcs_p.h
index f9e6d4c..f0b4b6b 100644
--- a/libhpcs_p.h
+++ b/libhpcs_p.h
@@ -68,7 +68,7 @@ const char* MON_DEC_STR = "Dec";
 const HPCS_step CE_CURRENT_STEP = 0.01;
 const HPCS_step CE_CCD_STEP = 0.0000596046450027643;
 const HPCS_step CE_DAD_STEP = 0.000476837158203;
-const HPCS_step CE_ENERGY_STEP = 0.0000055555555;
+const HPCS_step CE_ENERGY_STEP = 0.00000459365687208207;
 const HPCS_step CE_WORK_PARAM_STEP = 0.001;
 const HPCS_step CE_WORK_PARAM_OLD_STEP = 0.000083333333;