From f7c1029fb7b8144a5d3ed00417bda4b456a9c2ff Mon Sep 17 00:00:00 2001 From: Pau Gargallo Date: Thu, 27 Aug 2015 18:35:46 +0200 Subject: [PATCH] Check if force-focal/force-ccd arguments are given --- run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.py b/run.py index 1bb1862d..cfbb578e 100755 --- a/run.py +++ b/run.py @@ -340,14 +340,14 @@ def prepare_objects(): fileObject["width"] = int(match.group(1).strip()) fileObject["height"] = int(match.group(2).strip()) - if '--force-focal' not in args: + if args.force_focal is None: match = re.search(":[\ ]*([0-9\.]*)mm", file_focal) if match: fileObject["focal"] = float((match.group()[1:-2]).strip()) else: fileObject["focal"] = args.force_focal - if '--force-ccd' not in args: + if args.force_ccd is None: match = re.search(":[\ ]*([0-9\.]*)mm", file_ccd) if match: fileObject["ccd"] = float(match.group()[1:-2].strip())