| diff --git a/xia2-0.3.1.7/Applications/xia2find.py b/xia2-0.3.1.7/Applications/xia2find.py |
| index 1a3b0e2..e0b8a1e 100755 |
| --- a/xia2-0.3.1.7/Applications/xia2find.py |
| +++ b/xia2-0.3.1.7/Applications/xia2find.py |
| @@ -38,7 +38,7 @@ from Schema.Sweep import SweepFactory |
| from Experts.FindImages import image2template_directory |
| |
| known_image_extensions = ['img', 'mccd', 'mar2300', 'mar1200', 'mar3450', |
| - 'osc', 'cbf', 'mar2000']] |
| + 'osc', 'cbf', 'mar2000'] |
| known_sweeps = { } |
| |
| def is_image_name(file): |
| diff --git a/xia2-0.3.1.7/Experts/DRStrategyExpert.py b/xia2-0.3.1.7/Experts/DRStrategyExpert.py |
| index 28b1dc3..dba3ef7 100644 |
| --- a/xia2-0.3.1.7/Experts/DRStrategyExpert.py |
| +++ b/xia2-0.3.1.7/Experts/DRStrategyExpert.py |
| @@ -48,24 +48,24 @@ strategy_dict = { |
| 'default':{ |
| 'score':1, |
| 'pipeline':{ |
| - 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} |
| + 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, |
| 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', |
| 'pointless-1.1.0.4']}, |
| 'default':{ |
| 'score':2, |
| 'pipeline':{ |
| - 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'} |
| + 'indexer':'labelit', 'integrater':'mosflm', 'scaler':'mosflm'}, |
| 'depends-on':['labelit.screen', 'mosflm', 'scala', 'reindex', |
| 'pointless-1.1.0.4']}, |
| 'mosaic':{ |
| 'score':1, |
| 'pipeline':{ |
| - 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'} |
| + 'indexer':'labelit', 'integrater':'xds', 'scaler':'xds-hybrid'}, |
| 'depends-on':['labelit.screen', 'xds', 'xscale', 'scala', 'combat', |
| 'pointless-1.1.0.4']}, |
| 'mosaic':{ |
| 'score':2, |
| 'pipeline':{ |
| - 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'} |
| + 'indexer':'xds', 'integrater':'xds', 'scaler':'xds'}, |
| 'depends-on':['xds', 'xscale']} |
| } |
| diff --git a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py |
| index 88f9218..5fb6f2a 100644 |
| --- a/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py |
| +++ b/xia2core-0.3.1.7/Python/Examples/CCP4/Cad.py |
| @@ -49,8 +49,8 @@ def Cad(DriverType = None): |
| self.add_command_line(hklin) |
| |
| self.set_task('Rewriting reflections %s => %s' % |
| - ` (os.path.split(hklin)[-1], |
| - ` os.path.split(self.getHklout())[-1])) |
| + (os.path.split(hklin)[-1], |
| + os.path.split(self.getHklout())[-1])) |
| |
| self.start() |
| |
