Merge pull request #4 from openmc-data-storage/adding-fendl

Adding fendl

Author: shimwell

make_index.py

@@ -0,0 +1,84 @@
+import requests
+import json
+import os
+import csv
+
+# reads in the JSON index files and makes a more compact table of the data
+
+compact_table = []
+local_file_paths = []
+
+urls=[
+    "https://raw.githubusercontent.com/openmc-data-storage/ENDF-B-VIII.0-NNDC-json/refs/heads/main/json_files/ENDFB-8.0_index.json",
+    "https://raw.githubusercontent.com/openmc-data-storage/FENDL-3.2c-json/refs/heads/main/FENDL-3.2c_json/FENDL-3.2c_index.json",
+]
+i=0
+for url in urls:
+    print(url)
+    local_file_path= url.split('/')[-1]
+    if os.path.exists(local_file_path):
+        with open(local_file_path, 'r') as file:
+            data = json.load(file)
+    else:
+        print(f'downloading file {local_file_path}')
+
+        response = requests.get(url)
+        data = response.json()
+        with open(local_file_path, 'w') as file:
+            json.dump(data, file)
+
+
+    for entry in data:
+        # print(entry.keys())
+        # input()
+        new_entry = {}
+        new_entry['id'] =i  # id
+        new_entry['element'] = entry['Atomic symbol']
+        new_entry['nucleons'] = entry['Mass number']
+        new_entry['library'] = entry['Library']
+        # new_entry['reaction'] = f'({entry["Incident particle"][0]},{entry["Reaction products"]})'
+        new_entry['incident_particle'] = entry["Incident particle"][0]
+        new_entry['mt'] = entry['MT reaction number']
+        new_entry['temperature'] = entry['Temperature(K)']
+        
+
+        compact_table.append(new_entry)
+        
+        i=i+1
+
+with open('src/types/table_data.json', 'w') as outfile:
+    json.dump(compact_table, outfile)
+    
+# Write to CSV file
+csv_file_path = 'src/types/table_data.csv'
+csv_columns = ['id', 'element', 'nucleons', 'library', 'incident_particle', 'mt', 'temperature']
+
+with open(csv_file_path, 'w', newline='') as csvfile:
+    writer = csv.DictWriter(csvfile, fieldnames=csv_columns)
+    writer.writeheader()
+    for data in compact_table:
+        writer.writerow(data)
+
+# index_filename
+# [
+#         {
+#             "Proton number": 19,
+#             "Mass number": 39,
+#             "Neutron number": 20,
+#             "Element": "potassium",
+#             "Atomic symbol": "K",
+#             "Temperature(K)": "0",
+#             "Incident particle": "neutron",
+#             "Reaction products": "elastic",
+#             "MT reaction number": 2,
+#             "Library": "FENDL-3.2c"},
+
+#     {
+#         "id": 0,
+#         "element": "Dy",
+#         "nucleons": 157,
+#         "library": "ENDFB-8.0",
+#         "reaction": "damage-energy",
+#         "MT": 444,
+#         "temperature": "294K"
+#     },

src/sauce/home.rs

@@ -155,8 +155,14 @@ async fn get_values_by_id(id: i32) -> Result<(Vec<f64>, Vec<f64>, String), reqwe
     let output = convert_string(entry);
     console::log_1(&serde_wasm_bindgen::to_value(&"output").unwrap());
     console::log_1(&serde_wasm_bindgen::to_value(&output).unwrap());
+    console::log_1(&serde_wasm_bindgen::to_value(&"entry.library").unwrap());
+    console::log_1(&serde_wasm_bindgen::to_value(&entry.library).unwrap());
 
-    let url = format!("https://raw.githubusercontent.com/openmc-data-storage/ENDF-B-VIII.0-NNDC-json/refs/heads/main/json_files/{output}.json");
+    let url = match entry.library.as_str() {
+        "ENDFB-8.0" => format!("https://raw.githubusercontent.com/openmc-data-storage/ENDF-B-VIII.0-NNDC-json/refs/heads/main/json_files/{output}.json"),
+        "FENDL-3.2c" => format!("https://raw.githubusercontent.com/openmc-data-storage/FENDL-3.2c-json/refs/heads/main/FENDL-3.2c_json/{output}.json"),
+        _ => panic!("Unsupported library: {}", entry.library),
+    };
 
     console::log_1(&serde_wasm_bindgen::to_value(&url).unwrap());
     let downloaded_reaction_data: ReactionData = reqwest::get(url)
@@ -166,7 +172,7 @@ async fn get_values_by_id(id: i32) -> Result<(Vec<f64>, Vec<f64>, String), reqwe
         console::log_1(&serde_wasm_bindgen::to_value("downloaded data").unwrap());
         console::log_1(&serde_wasm_bindgen::to_value(&downloaded_reaction_data).unwrap());
 
-    let label = entry.element.clone() + entry.nucleons.to_string().as_str() + " " + entry.reaction.as_str(); // + " " +entry.library.as_str()  +" " + entry.temperature.as_str();
+    let label = entry.element.clone() + entry.nucleons.to_string().as_str() + " " + entry.reaction.as_str()+ " " +entry.library.as_str(); //   +" " + entry.temperature.as_str();
     Ok((downloaded_reaction_data.energy_values, downloaded_reaction_data.cross_section_values, label))
 }
 
@@ -179,7 +185,7 @@ fn convert_string(entry: &Entry) -> String {
     let particle:char = 'n';  // entry.particle.clone();
     let mt = entry.mt.clone();
     let temperature = entry.temperature.clone();
-    let output = format!("{}_{}_{}_{}_{}_{}", element, nucleons, library, particle, mt, temperature);
+    let output = format!("{}_{}_{}_{}_{}_{}K", element, nucleons, library, particle, mt, temperature);
     output
 }
 
@@ -193,10 +199,12 @@ pub fn home() -> Html {
     let nucleons_search_term = use_state(|| None::<String>);
     let reaction_search_term = use_state(|| None::<String>);
     let mt_search_term = use_state(|| None::<String>);
+    let library_search_term = use_state(|| None::<String>);
     let element_search = (*element_search_term).as_ref().cloned();
     let nucleons_search = (*nucleons_search_term).as_ref().cloned();
     let reaction_search = (*reaction_search_term).as_ref().cloned();
     let mt_search = (*mt_search_term).as_ref().cloned();
+    let library_search = (*library_search_term).as_ref().cloned();
 
     let page = use_state(|| 0usize);
     let current_page = (*page).clone();
@@ -212,6 +220,7 @@ pub fn home() -> Html {
         ColumnBuilder::new("reaction").orderable(true).short_name("Reaction").data_property("reaction").header_class("user-select-none").build(),
         // ColumnBuilder::new("library").orderable(true).short_name("Library").data_property("library").header_class("user-select-none").build(),
         ColumnBuilder::new("mt").orderable(true).short_name("MT").data_property("mt").header_class("user-select-none").build(),
+        ColumnBuilder::new("library").orderable(true).short_name("Library").data_property("library").header_class("user-select-none").build(),
         // ColumnBuilder::new("temperature").orderable(true).short_name("Temperature").data_property("temperature").header_class("user-select-none").build(),
     ];
 
@@ -239,6 +248,7 @@ pub fn home() -> Html {
             let nucleons = &entry.nucleons;
             let reaction = &entry.reaction;
             let mt = &entry.mt;
+            let library = &entry.library;
 
             let element_match = match element_search {
                 Some(ref term) => element.to_lowercase().contains(&term.to_lowercase()),
@@ -256,17 +266,21 @@ pub fn home() -> Html {
                 Some(ref term) => mt.to_string().contains(&*term),
                 None => true,
             };
+            let library_match = match library_search {
+                Some(ref term) => library.to_lowercase().contains(&term.to_lowercase()),
+                None => true,
+            };
 
-            element_match && nucleons_match && reaction_match && mt_match
+            element_match && nucleons_match && reaction_match && mt_match && library_match
         })
         .map(|(index, entry)| TableLine {
             original_index: index,
             id: entry.id,
             element: entry.element.clone(),
             nucleons: entry.nucleons.clone(),
-            library: entry.library.clone(),
             reaction: entry.reaction.clone(),
             mt: entry.mt.clone(),
+            library: entry.library.clone(),
             temperature: entry.temperature.clone(),
             checked: selected_indexes.current().contains(&index),
             sum_callback: callback_sum.clone(),
@@ -339,6 +353,18 @@ pub fn home() -> Html {
         })
     };
 
+    let oninput_library_search = {
+        let library_search_term = library_search_term.clone();
+        Callback::from(move |e: InputEvent| {
+            let input: HtmlInputElement = e.target_unchecked_into();
+            if input.value().is_empty() {
+                library_search_term.set(None);
+            } else {
+                library_search_term.set(Some(input.value()));
+            }
+        })
+    };
+
     // let pagination_options = yew_custom_components::pagination::Options::default()
     //     .show_prev_next(true)
     //     .show_first_last(true)
@@ -412,6 +438,18 @@ pub fn home() -> Html {
                         oninput={oninput_mt_search} 
                     />
                 </div>
+                <div class="flex-grow-1 p-2 input-group">
+                    <span class="input-group-text">
+                        <i class="fas fa-search"></i>
+                    </span>
+                    <input 
+                        class="form-control" 
+                        type="text" 
+                        id="library-search" 
+                        placeholder="Search by library" 
+                        oninput={oninput_library_search} 
+                    />
+                </div>
             </div>
 
 
@@ -421,13 +459,13 @@ pub fn home() -> Html {
                     options={options.clone()} 
                     limit={Some(limit)} 
                     page={current_page} 
-                    search={element_search.clone()} 
+                    // search={element_search.clone()} 
                     classes={classes!("table", "table-hover")} 
                     columns={columns.clone()} 
                     data={paginated_data} 
                     orderable={true}
                 />
-                <h5>{"Number selected"} <span class="badge text-bg-secondary">{sum}</span></h5>
+                <h5>{"Selected"} <span class="badge text-bg-secondary">{sum}</span>{" from 41337 available database entries."}</h5>
                 </div>
                 <div class="flex-grow-1 p-2 input-group">
 
@@ -454,17 +492,17 @@ struct TableLine {
     pub id: i32,
     pub element: String,
     pub nucleons: i32,
-    pub library: String,
     pub reaction: String,
     pub mt: i32,
+    pub library: String,
     pub temperature: String,
     #[serde(skip_serializing)]
     pub sum_callback: Callback<usize>,
 }
 
 impl PartialEq<Self> for TableLine {
     fn eq(&self, other: &Self) -> bool {
-        self.element == other.element && self.nucleons == other.nucleons && self.checked == other.checked
+        self.element == other.element && self.nucleons == other.nucleons && self.library == other.library && self.reaction == other.reaction  && self.mt == other.mt && self.checked == other.checked
     }
 }