Roll back commits
This commit is contained in:
parent
e59aa2d034
commit
46ef08874a
4
main.py
4
main.py
@ -182,7 +182,7 @@ def load_data(data_path: str, data={}) -> dict:
|
||||
"x2-dt": x2_time_dt
|
||||
}
|
||||
|
||||
data[x2_shot]["time"]["x2_uncert"] = max(UNCERTS["time"]["x2-daq"], data[x2_shot]["time"]["x2-dt"])
|
||||
data[x2_shot]["time"]["x2_uncert"] = UNCERTS["time"]["x2-daq"] #max(UNCERTS["time"]["x2-daq"], data[x2_shot]["time"]["x2-dt"])
|
||||
|
||||
# Setup custom scaling on the gauge values
|
||||
if "x2" in data_locs:
|
||||
@ -531,7 +531,7 @@ def load_ref_data(x2_shot: str, data_path: str, data={}) -> dict:
|
||||
"x2-dt": x2_time_dt
|
||||
}
|
||||
|
||||
data[x2_shot]["time"]["x2_uncert"] = max(UNCERTS["time"]["x2-daq"], data[x2_shot]["time"]["x2-dt"])
|
||||
data[x2_shot]["time"]["x2_uncert"] = UNCERTS["time"]["x2-daq"] #max(UNCERTS["time"]["x2-daq"], data[x2_shot]["time"]["x2-dt"])
|
||||
|
||||
|
||||
# Find Shock Times
|
||||
|
Loading…
x
Reference in New Issue
Block a user