Wanlau commited on
Commit
013b032
·
1 Parent(s): 70f1ac9
Files changed (2) hide show
  1. NDfilter.py +2 -2
  2. app.py +1 -1
NDfilter.py CHANGED
@@ -203,13 +203,13 @@ def nuclideData_dict2dataframeCompact(nuclideData_dict):
203
  data = []
204
  for level in nuclideData_dict["levels"]:
205
  if level["halflife"]["value"] == "STABLE":
206
- data.append((str(level["energy"]["value"])+f" {level["energy"]["unit"]}", level["spinParity"], level["massExcess"]["formats"]["NDS"]+" "+level["massExcess"]["unit"], "STABLE", None))
207
  else:
208
  decayModes = []
209
  for decayMode in level["decayModes"]["observed"]:
210
  decayModes.append((decayMode["mode"], decayMode["value"]))
211
  decayModeDF = pd.DataFrame(decayModes, columns=["Decay Mode", "Branch Ratio"])
212
- data.append((str(level["energy"]["value"])+f" {level["energy"]["unit"]}", level["spinParity"], level["massExcess"]["formats"]["NDS"]+" "+level["massExcess"]["unit"], level["halflife"]["formats"]["NDS"]+" "+level["halflife"]["unit"], decayModeDF))
213
 
214
  nuclideDataframe = pd.DataFrame(data, columns=["E(level)", "Spin Parity", "Mass Excess", "Halflife", "Decay Modes"])
215
 
 
203
  data = []
204
  for level in nuclideData_dict["levels"]:
205
  if level["halflife"]["value"] == "STABLE":
206
+ data.append((str(level["energy"]["value"])+" "+level["energy"]["unit"], level["spinParity"], level["massExcess"]["formats"]["NDS"]+" "+level["massExcess"]["unit"], "STABLE", None))
207
  else:
208
  decayModes = []
209
  for decayMode in level["decayModes"]["observed"]:
210
  decayModes.append((decayMode["mode"], decayMode["value"]))
211
  decayModeDF = pd.DataFrame(decayModes, columns=["Decay Mode", "Branch Ratio"])
212
+ data.append((str(level["energy"]["value"])+" "+level["energy"]["unit"], level["spinParity"], level["massExcess"]["formats"]["NDS"]+" "+level["massExcess"]["unit"], level["halflife"]["formats"]["NDS"]+" "+level["halflife"]["unit"], decayModeDF))
213
 
214
  nuclideDataframe = pd.DataFrame(data, columns=["E(level)", "Spin Parity", "Mass Excess", "Halflife", "Decay Modes"])
215
 
app.py CHANGED
@@ -54,7 +54,7 @@ def process_search(mode_idx, nom, z, n, a, preview_mode, file_type):
54
  else:
55
  ## 文本
56
  name = result["name"]
57
- result_text = f"{name}" + "\n\nnndc页面:\ngetdataset:\n" + f"https://www.nndc.bnl.gov/nudat3/getdataset.jsp?nucleus={name}&unc=NDS"
58
  ## temp
59
  with open ("data/haveDecayPage.json",'r', encoding='utf-8') as file:
60
  haveDecayPage = json.load(file)
 
54
  else:
55
  ## 文本
56
  name = result["name"]
57
+ result_text = f"{name}" + "\n\nnndc页面:\n\ngetdataset:\n" + f"https://www.nndc.bnl.gov/nudat3/getdataset.jsp?nucleus={name}&unc=NDS"
58
  ## temp
59
  with open ("data/haveDecayPage.json",'r', encoding='utf-8') as file:
60
  haveDecayPage = json.load(file)