Skip to content

Commit 4b1d7b4

Browse files
committed
Update aiidalab-eln
1 parent 3331f90 commit 4b1d7b4

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

aiidalab_eln/openbis/__init__.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def get_all_structures_and_geoopts(self, node):
157157
if "GeoOpt" in current_node.label:
158158
all_geoopts.append(current_node)
159159
current_node = current_node.inputs.structure
160-
elif "ORBITALS" in current_node.label:
160+
elif "ORBITALS" in current_node.label or "STM" in current_node.label:
161161
current_node = current_node.inputs.structure
162162
else:
163163
current_node = current_node.caller
@@ -340,11 +340,11 @@ def create_stm_simulations(self, stms_nodes, stms_inside_openbis, collection_ide
340340

341341
#TODO: Remove this is the future. Orbitals do not have stm_params
342342
try:
343-
stm_params = dict(stm.inputs.stm_params)
343+
stm_params = dict(stm.inputs.spm_params)
344344
stm_model.props = {
345-
"emin-J": stm_params['--energy_range'][0] * 1.60217663e-19,
346-
"emax-J": stm_params['--energy_range'][1] * 1.60217663e-19,
347-
"de-J": stm_params['--energy_range'][2] * 1.60217663e-19
345+
"emin-j": float(stm_params['--energy_range'][0]) * 1.60217663e-19,
346+
"emax-j": float(stm_params['--energy_range'][1]) * 1.60217663e-19,
347+
"de-j": float(stm_params['--energy_range'][2]) * 1.60217663e-19
348348
}
349349
except:
350350
pass
@@ -432,8 +432,7 @@ def export_data(self):
432432
if isinstance(self.node, orm.WorkChainNode):
433433

434434
# Get structure used in the Workchain
435-
structure_stm = self.node.inputs.structure
436-
all_aiida_stms = [structure_stm]
435+
all_aiida_stms = [self.node]
437436

438437
# Verify which structures (atomistic models) are already in openBIS
439438
all_aiida_stms, all_stms_inside_openbis = self.check_aiida_objects_in_openbis(all_aiida_stms, simulations_openbis)

0 commit comments

Comments
 (0)