diff --git a/nslsii/sync_experiment/.DS_Store b/nslsii/sync_experiment/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/nslsii/sync_experiment/.DS_Store and /dev/null differ diff --git a/nslsii/sync_experiment/sync_experiment.py b/nslsii/sync_experiment/sync_experiment.py index f0bdfa12..2e4e8522 100644 --- a/nslsii/sync_experiment/sync_experiment.py +++ b/nslsii/sync_experiment/sync_experiment.py @@ -3,6 +3,7 @@ import json import re +import os import redis import httpx import warnings @@ -174,8 +175,7 @@ def main(): "--beamline", dest="beamline", type=str, - help="Which beamline (e.g. CHX)", - required=True, + help="Which beamline (e.g. CHX)" ) parser.add_argument( "-p", @@ -188,6 +188,11 @@ def main(): parser.add_argument("-v", "--verbose", action=argparse.BooleanOptionalAction) args = parser.parse_args() + + beamline = args.beamline or os.getenv("BEAMLINE_ACRONYM") + # Make required: + if not beamline: + raise ValueError("Beamline needs to be specified. Either provide -b, --beamline or set BEAMLINE_ACRONYM in env vars.") sync_experiment( - proposal_number=args.proposal, beamline=args.beamline, verbose=args.verbose + proposal_number=args.proposal, beamline=beamline, verbose=args.verbose )