# HG changeset patch # User luca_milaz # Date 1719950778 0 # Node ID bb470e1319ddbb43002664263ac2303ff541f2f8 # Parent 1857af8733150818aaa2c79b2615314d641c88b1 Uploaded diff -r 1857af873315 -r bb470e1319dd marea_2_0/flux_sampling.py --- a/marea_2_0/flux_sampling.py Tue Jul 02 20:06:03 2024 +0000 +++ b/marea_2_0/flux_sampling.py Tue Jul 02 20:06:18 2024 +0000 @@ -182,15 +182,15 @@ ARGS.output_folder = 'flux_sampling/' - + modelNames = [] + modelNames[0] = os.path.splitext(os.path.basename(ARGS.input_model[0]))[0] # extract model filename only + modelNames[1] = os.path.splitext(os.path.basename(ARGS.input_model[1]))[0] # extract model filename only + # load custom model model1 = load_custom_model( - utils.FilePath.fromStrPath(ARGS.input_model[0]), utils.FilePath.fromStrPath(ARGS.model_name[0]).ext) + utils.FilePath.fromStrPath(ARGS.input_model[0]), modelNames[0].ext) model2 = load_custom_model( - utils.FilePath.fromStrPath(ARGS.input_model[1]), utils.FilePath.fromStrPath(ARGS.model_name[1]).ext) - - #ARGS.model_name = os.path.splitext(os.path.basename(ARGS.input_model))[0] # extract model filename only - + utils.FilePath.fromStrPath(ARGS.input_model[1]), modelNames[1].ext) with open(ARGS.output_folder, 'w') as f: f.write([model1, model2])