diff options
| author | Dominik Kriegner <dominik.kriegner@gmail.com> | 2015-11-07 18:21:08 +0100 |
|---|---|---|
| committer | Dominik Kriegner <dominik.kriegner@gmail.com> | 2015-11-07 18:21:08 +0100 |
| commit | 3a7233f36c3e63ccec3af2e9687f172800bd313e (patch) | |
| tree | 310b67f2bb0a0fa5c208a83efa36ed5413d75a19 | |
| parent | 33dbc446bc3795b30af82e8291c19927513d56bc (diff) | |
fix xrayutilities based backends w.r.t. API and spec-changes
| -rw-r--r-- | BINoculars/backends/bm25.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | BINoculars/backends/id03_xu.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/BINoculars/backends/bm25.py b/BINoculars/backends/bm25.py index d9d2b5f..0b9b567 100644 --- a/BINoculars/backends/bm25.py +++ b/BINoculars/backends/bm25.py @@ -85,6 +85,7 @@ class EDFInput(backend.InputBase): yield backend.Job(images=imgs, firstimage=s.start, lastimage=s.stop-1, weight=s.stop-s.start) def process_job(self, job): + super(EDFInput, self).process_job(job) images = self.get_images(job.images, job.firstimage, job.lastimage) # iterator! for image in images: diff --git a/BINoculars/backends/id03_xu.py b/BINoculars/backends/id03_xu.py index 7534321..1bf5a7b 100755..100644 --- a/BINoculars/backends/id03_xu.py +++ b/BINoculars/backends/id03_xu.py @@ -80,6 +80,7 @@ class ID03Input(backend.InputBase): yield backend.Job(scan=scanno, firstpoint=0, lastpoint=pointcount-1, weight=pointcount) def process_job(self, job): + super(ID03Input, self).process_job(job) scan = self.get_scan(job.scan) scanparams = self.get_scan_params(scan) # wavelength, UB @@ -146,7 +147,7 @@ class ID03Input(backend.InputBase): def get_images(self, scan, first, last, dry_run=False): try: uccdtagline = scan.header('UCCD')[0] - UCCD = os.path.dirname(uccdtagline[6:]).split(os.sep) + UCCD = os.path.split(os.path.dirname(uccdtagline.split()[-1])) except: print 'warning: UCCD tag not found, use imagefolder for proper file specification' UCCD = [] @@ -169,7 +170,7 @@ class ID03Input(backend.InputBase): except Exception as e: raise errors.ConfigError("invalid 'imagefolder' specification '{0}': {1}".format(self.config.imagefolder, e)) else: - imagefolder = os.path.join(UCCD[:-1]) + imagefolder = os.path.join(*UCCD) if not os.path.exists(imagefolder): raise ValueError("invalid 'imagefolder' specification '{0}'. Path {1} does not exist".format(self.config.imagefolder, imagefolder)) |