Merge lp:~jp-ellis/mg5amcnlo/allow-absolute-model-path into lp:mg5amcnlo/lts

[Joshua Ellis]

Allow for absolute paths to be specified for the model's UFO files.

Allow for absolute paths to be specified for the model's UFO files.

[Olivier Mattelaer (olivier-mattelaer)]

Dear Joshua,

I guess that the patch that you are looking for is

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py 2016-06-20 11:08:55 +0000
+++ models/import_ufo.py 2016-08-25 11:02:57 +0000
@@ -79,9 +79,9 @@
                     last_model_path = os.path.join(MG5DIR, p, model_name)
                 return os.path.join(MG5DIR, p, model_name)
     if os.path.isdir(model_name):
- if last_model_path != os.path.join(MG5DIR, p, model_name):
+ if last_model_path != os.path.join(MG5DIR, model_name):
             logger.info("model loaded from: %s", os.path.join(os.getcwd(), model_name))
- last_model_path = os.path.join(MG5DIR, p, model_name)
+ last_model_path = os.path.join(MG5DIR, model_name)
         return model_name
     else:
         raise UFOImportError("Path %s is not a valid pathname" % model_name)

Thanks,

Olivier

review: Needs Information

[Joshua Ellis (jp-ellis)]

Is that in addition to what I have, or an alternative?

Essentially, MadGraph current does not allow to have:

import model /some/path/to/model/ -modelname

and the patch I offer allows this to work, and as far as I can tell, it works (though you may want to do extra testing of course in case it has unforeseen consequences).

[Olivier Mattelaer (olivier-mattelaer)]

Hi,

> Is that in addition to what I have, or an alternative?

as an alternative.

> import model /some/path/to/model/ -modelname

This is actually working for me without any of those patch.
I guess that the reason is that I have PYTHONPATH in my environment.
If you do not have PYTHONPATH in your environment, I indeed expect a bug to occur.
This is that bug that I fix in my proposal.
With that fix, it is basically equivalent to the your proposal actually (up to a print statement)

Cheers,

Olivier

> On Aug 25, 2016, at 13:26, Joshua Ellis <email address hidden> wrote:
>
> Is that in addition to what I have, or an alternative?
>
> Essentially, MadGraph current does not allow to have:
>
> import model /some/path/to/model/ -modelname
>
> and the patch I offer allows this to work, and as far as I can tell, it works (though you may want to do extra testing of course in case it has unforeseen consequences).
> --
> https://code.launchpad.net/~jp-ellis/mg5amcnlo/allow-absolute-model-path/+merge/303914
> You are reviewing the proposed merge of lp:~jp-ellis/mg5amcnlo/allow-absolute-model-path into lp:mg5amcnlo.

[Joshua Ellis (jp-ellis)]

But, doesn't your patch still load the model from the MadGraph5 path, seeing as it is concatenating it with the model path?

What happens if the model is outside of the MadGraph5 path entirely?

Also, it is correct that I don't have the PYTHONPATH environment variable set (I'm not entirely sure why I should have it set...)

[Olivier Mattelaer (olivier-mattelaer)]

No I also return “model_name” exactly like you.
No difference on that.

> On Aug 25, 2016, at 13:45, Joshua Ellis <email address hidden> wrote:
>
> But, doesn't your patch still load the model from the MadGraph5 path, seeing as it is concatenating it with the model path?
>
> What happens if the model is outside of the MadGraph5 path entirely?
>
> Also, it is correct that I don't have the PYTHONPATH environment variable set (I'm not entirely sure why I should have it set...)
> --
> https://code.launchpad.net/~jp-ellis/mg5amcnlo/allow-absolute-model-path/+merge/303914
> You are reviewing the proposed merge of lp:~jp-ellis/mg5amcnlo/allow-absolute-model-path into lp:mg5amcnlo.

[Joshua Ellis (jp-ellis)]

I'll have a go at the patch you suggest tomorrow and let you know whether it works for me. Thanks!

[Olivier Mattelaer (olivier-mattelaer)]

Just to close this merge request,
I have implemented my proposal.
If it does not work for you, please tell me.

Cheers,

Olivier

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2016-06-08 22:44:34 +0000
+++ models/import_ufo.py	2016-08-25 10:25:05 +0000
@@ -69,6 +69,8 @@
     # Check for a valid directory
     if model_name.startswith('./') and os.path.isdir(model_name):
         return model_name
+    elif model_name.startswith('/') and os.path.isdir(model_name):
+        return model_name
     elif os.path.isdir(os.path.join(MG5DIR, 'models', model_name)):
         return os.path.join(MG5DIR, 'models', model_name)
     elif 'PYTHONPATH' in os.environ: