diff --git a/API-V2-elab.py b/API-V2-elab.py
index e8afb6b087718cdb3a998b28bd22ee460ec5260c..e1375b0fe7f7f9e60ccaaa237ec2470827af83e5 100644
--- a/API-V2-elab.py
+++ b/API-V2-elab.py
@@ -59,9 +59,9 @@ today = datetime.date.today()
########
-elab_id=640
-cers = ["75562_0001","75563_0001","75564_0001","75565_0001","75566_0001","75567_0001","75568_0001","75569_0001","75570_0001","75571_0001","75572_0001","75573_0001"] # Beispiel: cers = ["75511_0001","75512_0001"]
-TL1_2= "FM1" #### FM1 oder TLA
+elab_id=643
+cers = ["75552_0001","75553_0001"] # Beispiel: cers = ["75511_0001","75512_0001"]
+TL1_2= "TLA" #### FM1 oder TLA
year = "2024"
kk= "KK"
@@ -137,6 +137,7 @@ ReferenceNo =doc_tag["Calibration"]["Presettings"]["CommonReferenceNo"]
print('stopp')
Type_k =(doc_tag["Calibration"]["Type"])
+print(Type_k)
CustomerSign =(doc_tag["Calibration"]["Customer"]["Sign"])
diff --git a/attachment_cer.py b/attachment_cer.py
index e37ff5eb22dd70185047ee2e42536d118854c235..3e23f079b3b56ad278c9cfdb2fd5063549d8c3a9 100644
--- a/attachment_cer.py
+++ b/attachment_cer.py
@@ -17,7 +17,7 @@ db = couch['vl_db'] # existing
year = "2024"
-cers = ["75564","75565","75566","75567","75568","75569","75570","75571","75572","75573"] # Beispiel: cers = ["75511_0001","75512_0001"]
+cers = ["75552","75553"] # Beispiel: cers = ["75511_0001","75512_0001"]
#cers = ["75562","75563"] # Beispiel: cers = ["75511_0001","75512_0001"]
################### die Kalibrierscheine werden an das cer-json-dokument angehangen ##################
diff --git a/file-to-couchdb_tl2.py b/file-to-couchdb_tl2.py
index d2c28b7cefa270ca7b53a5c2448e4cc786d3d52e..fa4f7eecd4142d6a88fff2c0e28851ed9bbdf938 100644
--- a/file-to-couchdb_tl2.py
+++ b/file-to-couchdb_tl2.py
@@ -26,7 +26,7 @@ db = couch['vl_db'] # existing
-cal_cert = "75552"
+cal_cert = "75556"
year = "2024"
no = "0001"
@@ -36,9 +36,9 @@ doc = db.get(json_file)
# Die Daten aus dem File mit der entsprechenden Kalibrierscheinnummer werden eingelesen:
# datum, time, p_up und alle Temperaturen,
-
-datei = cal_cert + "PTB" + year
-datei_S = cal_cert + "PTB" + year + "_S"
+path='C:\\Users\\becker07\\python\\TL2\\'
+datei = path + cal_cert + "PTB" + year
+datei_S = path + cal_cert + "PTB" + year + "_S"
print(json_file)
datei_pkt = pd.read_csv(datei, sep="\t", decimal = ',' )
@@ -57,7 +57,8 @@ T_wv=datei_pkt["T-WV"]
T_tl=datei_pkt["T-TL"]
T_rv=datei_pkt["T-RV"]
p_atm=datei_pkt["Umgebungsdruck p_0"]*100 # Umrechnung in Pa
-m_sz = datei_pkt["m-SZ"]
+
+
m1_drift = datei_pkt["m1_D"]
m2_drift = datei_pkt["m2_D"]
print(p_atm)
@@ -70,6 +71,8 @@ l_2=datei_S_pkt["pos2_i"]
l_pos= l_1-l_2
l_i=datei_S_pkt["h_i"]
t_i=datei_S_pkt["t_i"]
+m_sz_i =datei_S_pkt["m_i"]
+
# Im File Datei_S sind die einzelnen Hübe l_i der Nadel in einer Spalte gespeichert, der Hub l
# muss daher in Hub l_1 und l_2 aufgegliedert werden, da in der Regel 2 Sägezähne gefahren werden.
@@ -77,7 +80,6 @@ l_1=l_pos[0::2] # Begonnen wird in der Spalte beim Element 0 bis zum Ende der S
l_2=l_pos[1::2] # Begonnen wird in der Spalte beim Element 1 bis zum Ende der Spalte in zweier Schritte
-
#l_1=np.genfromtxt(datei_S,skip_header=1,usecols=(2)) #### wenn nur 1 SZ vorhanden
@@ -87,6 +89,11 @@ t_1=t_i[0::2] # Begonnen wird in der Spalte beim Element 0 bis zum Ende der Sp
t_2=t_i[1::2] # Begonnen wird in der Spalte beim Element 1 bis zum Ende der Spalte in zweier Schritte
#t_1=np.genfromtxt(datei_S,skip_header=1,usecols=(3))#### wenn nur 1 SZ vorhanden
+
+# Das gleiche gilt für den SZ m_sz__i
+m_sz_1=m_sz_i[0::2] # Begonnen wird in der Spalte beim Element 0 bis zum Ende der Spalte in zweier Schritte
+m_sz_2=m_sz_i[1::2] # Begonnen wird in der Spalte beim Element 1 bis zum Ende der Spalte in zweier Schritte
+
# Temperatur
lis_T_h2o = T_h2o.tolist()
lis_T_room = T_room.tolist()
@@ -99,7 +106,8 @@ lis_p_up = p_up.tolist()
# Drift
lis_m1_drift = m1_drift.tolist()
lis_m2_drift = m2_drift.tolist()
-lis_m_sz = m_sz.tolist()
+lis_m1_sz = m_sz_1.tolist()
+lis_m2_sz = m_sz_2.tolist()
# Datum
lis_date = datum.tolist()
lis_dtime = time.tolist()
@@ -119,21 +127,22 @@ print(lis_T_room)
-doc["Calibration"]["Measurement"]["Values"]={"Temperature": [{"Unit": "C","Type": "T-H2O ","Comment":"Temperatur T ","Value": lis_T_h2o},
+doc["Calibration"]["Measurement"]["Values"]={"Temperature": [{"Unit": "C","Type": "T-H2O","Comment":"Temperatur T ","Value": lis_T_h2o},
{"Unit": "C","Type": "T-Room","Comment":"Temperatur T","Value": lis_T_room},
- {"Unit": "C","Type": "T-TL ","Comment":"Temperatur T","Value": lis_T_tl},
- {"Unit": "C","Type": "T-WV ","Comment":"Temperatur T","Value": lis_T_wv},
- {"Unit": "C","Type": "T-RV ","Comment":"Temperatur T","Value": lis_T_rv}],
- "Pressure": [{"Unit": "mbar","Type": "Atmosparic pressure ","Value": lis_p_atm},
- {"Unit": "bar","Type": "Upstream pressure ","Value": lis_p_up}],
- "Time": [{"Unit": "s","Type": "Zeit des ersten Sägezahns ","Value": lis_t1},
- {"Unit": "s","Type": "Zeit des zweiten Sägezahns ","Value": lis_t2}],
- "L": [{"Unit": "mm","Type": "Hub des ersten Sägezahns ","Value": lis_l1},
- {"Unit": "mm","Type": "Hub des zweiten Sägezahns ","Value": lis_l2}],
- "Drift": [{"Unit": "mbar/s","Type": "Steigung des Sägezahns ","Value": lis_m_sz},
- {"Unit": "mbar/s","Type": "Drift des ersten Sägezahns ","Value": lis_m1_drift},
- {"Unit": "mbar/s","Type": "Drift des zweiten Sägezahns ","Value": lis_m2_drift}],
- "DateTime": [{"Unit": "yyyy-mm-dd","Type": "Date ","Value": lis_date},
+ {"Unit": "C","Type": "T-TL","Comment":"Temperatur T","Value": lis_T_tl},
+ {"Unit": "C","Type": "T-WV","Comment":"Temperatur T","Value": lis_T_wv},
+ {"Unit": "C","Type": "T-RV","Comment":"Temperatur T","Value": lis_T_rv}],
+ "Pressure": [{"Unit": "Pa","Type": "Atmosparic pressure","Value": lis_p_atm},
+ {"Unit": "bar","Type": "Upstream pressure","Value": lis_p_up}],
+ "Time": [{"Unit": "s","Type": "Zeit des ersten Saegezahns","Value": lis_t1},
+ {"Unit": "s","Type": "Zeit des zweiten Saegezahns","Value": lis_t2}],
+ "L": [{"Unit": "mm","Type": "Hub des ersten Saegezahns","Value": lis_l1},
+ {"Unit": "mm","Type": "Hub des zweiten Saegezahns","Value": lis_l2}],
+ "Drift": [{"Unit": "Pa/s","Type": "Steigung des ersten Saegezahns","Value": lis_m1_sz},
+ {"Unit": "Pa/s","Type": "Steigung des zweiten Saegezahns","Value": lis_m2_sz},
+ {"Unit": "Pa/s","Type": "Drift des ersten Saegezahns","Value": lis_m1_drift},
+ {"Unit": "Pa/s","Type": "Drift des zweiten Saegezahns","Value": lis_m2_drift}],
+ "DateTime": [{"Unit": "yyyy-mm-dd","Type": "Date","Value": lis_date},
{"Unit": "hh:mm","Type": "Time ","Value": lis_dtime}]}
diff --git a/writeLaTeX-ks-TL2.py b/writeLaTeX-ks-TL2.py
index 1b7cab9be3a9849ab9fb5129046a5554d7b8eba2..b0b61cc9aa857fcb2f9c6800cb37f9ac3a4ae52d 100644
--- a/writeLaTeX-ks-TL2.py
+++ b/writeLaTeX-ks-TL2.py
@@ -4,8 +4,8 @@ from datetime import date
couch = couchdb.Server('http://a73434.berlin.ptb.de:5984')
db = couch['vl_db'] # existing
-cal_cert = "75204"
-year = "2023"
+cal_cert = "75553"
+year = "2024"
no = "0001"
diff --git a/writeLaTex-ks-TL1.py b/writeLaTex-ks-TL1.py
index f9684e30c06f7fb56813fbc6e0d6e9dd0012110f..4f31d8e5f108e0b787c9e4017546fe3abeb00e95 100644
--- a/writeLaTex-ks-TL1.py
+++ b/writeLaTex-ks-TL1.py
@@ -17,7 +17,7 @@ db = couch['vl_db'] # existing
# - Jahr der Kalibrierung
# - laufende Nummer der Kalibrierung
-cal_cert = "75573"
+cal_cert = "75552"
year = "2024"
year_Mark=year[2:]
print(year_Mark)