Remove unnecessary format subclass methods

format/FormatBruker.py

@@ -2,6 +2,7 @@
 
 from builtins import range
 from dxtbx.format.Format import Format
+from dxtbx import IncorrectFormatError
 
 
 class FormatBruker(Format):
@@ -92,12 +93,9 @@ def understand(image_file):
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
 
-        from dxtbx import IncorrectFormatError
-
         if not self.understand(image_file):
             raise IncorrectFormatError(self, image_file)
-
-        Format.__init__(self, image_file, **kwargs)
+        super(FormatBruker, self).__init__(str(image_file), **kwargs)
 
     def detectorbase_start(self):
         pass

format/FormatBrukerFixedChi.py

@@ -26,18 +26,6 @@ def understand(image_file):
 
         return True
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment. Easy from Rigaku Saturn images as
-        they contain everything pretty much we need..."""
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        self._image_file = image_file
-        FormatBruker.__init__(self, image_file, **kwargs)
-
     def _start(self):
         self.header_dict = {}
         header_text = open(self._image_file).read().split("......")[0]

format/FormatBrukerPhotonII.py

@@ -46,17 +46,6 @@ def understand(image_file):
 
         return True
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment. Easy from Rigaku Saturn images as
-        they contain everything pretty much we need..."""
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        self._image_file = image_file
-        FormatBruker.__init__(self, image_file, **kwargs)
-
     def _start(self):
 
         try:

format/FormatCBF.py

@@ -12,6 +12,7 @@
 
 import six
 from dxtbx.format.Format import Format
+from dxtbx import IncorrectFormatError
 
 
 class FormatCBF(Format):
@@ -58,12 +59,10 @@ def get_cbf_header(image_file):
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
 
-        from dxtbx import IncorrectFormatError
-
         if not self.understand(image_file):
             raise IncorrectFormatError(self, image_file)
 
-        Format.__init__(self, image_file, **kwargs)
+        super(FormatCBF, self).__init__(str(image_file), **kwargs)
 
     @staticmethod
     def _parse_cbf_header(cbf_header):
@@ -97,8 +96,6 @@ def _start(self):
         """Open the image file, read the image header, copy it into memory
         for future inspection."""
 
-        Format._start(self)
-
         self._cif_header = FormatCBF.get_cbf_header(self._image_file)
 
         self._mime_header = ""

format/FormatCBFFull.py

@@ -36,24 +36,12 @@ def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
 
         # It appears Pycbf can not handle unicode filenames (see dials/dials#256)
-        image_file = str(image_file)
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBF.__init__(self, image_file, **kwargs)
         self._raw_data = None
+        super(FormatCBFFull, self).__init__(str(image_file), **kwargs)
 
     def __del__(self):
         self._cbf_handle.__swig_destroy__(self._cbf_handle)
 
-    def _start(self):
-        """Open the image file as a cbf file handle, and keep this somewhere
-        safe."""
-
-        FormatCBF._start(self)
-
     def _get_cbf_handle(self):
         try:
             return self._cbf_handle

format/FormatCBFFullPilatus.py

@@ -32,24 +32,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFFull.__init__(self, image_file, **kwargs)
-
-        self._raw_data = None
-
-    def _start(self):
-        """Open the image file as a cbf file handle, and keep this somewhere
-        safe."""
-
-        FormatCBFFull._start(self)
-
     def _beam(self):
         """Return a working beam instance. Override polarization to be 0.999."""
 

format/FormatCBFFullPilatusDLS300KSN104.py

@@ -49,11 +49,8 @@ def has_dynamic_shadowing(**kwargs):
 
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
-
-        assert self.understand(image_file)
-
         self._dynamic_shadowing = self.has_dynamic_shadowing(**kwargs)
-        FormatCBFFullPilatus.__init__(self, image_file, **kwargs)
+        super(FormatCBFFullPilatusDLS300KSN104, self).__init__(image_file, **kwargs)
 
     def get_mask(self, goniometer=None):
         mask = super(FormatCBFFullPilatusDLS300KSN104, self).get_mask()

format/FormatCBFFullPilatusDLS6MSN100.py

@@ -43,13 +43,9 @@ def has_dynamic_shadowing(**kwargs):
 
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
 
         self._dynamic_shadowing = self.has_dynamic_shadowing(**kwargs)
-        FormatCBFFullPilatus.__init__(self, image_file, **kwargs)
+        super(FormatCBFFullPilatusDLS6MSN100, self).__init__(image_file, **kwargs)
 
     def get_mask(self, goniometer=None):
         mask = super(FormatCBFFullPilatusDLS6MSN100, self).get_mask()

format/FormatCBFFullPilatusDLS6MSN126.py

@@ -48,13 +48,9 @@ def has_dynamic_shadowing(**kwargs):
 
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
 
         self._dynamic_shadowing = self.has_dynamic_shadowing(**kwargs)
-        FormatCBFFullPilatus.__init__(self, image_file, **kwargs)
+        super(FormatCBFFullPilatusDLS6MSN126, self).__init__(image_file, **kwargs)
 
     def get_mask(self, goniometer=None):
         mask = super(FormatCBFFullPilatusDLS6MSN126, self).get_mask()

format/FormatCBFMini.py

@@ -62,21 +62,14 @@ def one_of_these_in(record):
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
 
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBF.__init__(self, image_file, **kwargs)
-
         self._raw_data = None
+        super(FormatCBFMini, self).__init__(image_file, **kwargs)
 
     def _start(self):
         """Open the image file, read the image header, copy it into a
         dictionary for future reference."""
 
-        FormatCBF._start(self)
-
+        super(FormatCBFMini, self)._start()
         cif_header = FormatCBF.get_cbf_header(self._image_file)
 
         self._cif_header_dictionary = {}

format/FormatCBFMiniADSCHF4M.py

@@ -51,22 +51,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMini.__init__(self, image_file, **kwargs)
-
-        self._raw_data = None
-
-    def _start(self):
-        FormatCBFMini._start(self)
-
     def _detector(self):
         """Return a model for a simple detector, presuming no one has
         one of these on a two-theta stage. Assert that the beam centre is

format/FormatCBFMiniEiger.py

@@ -40,22 +40,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMini.__init__(self, image_file, **kwargs)
-
-        self._raw_data = None
-
-    def _start(self):
-        FormatCBFMini._start(self)
-
     def _detector(self):
         distance = float(self._cif_header_dictionary["Detector_distance"].split()[0])
 

format/FormatCBFMiniEigerDLS16MSN160.py

@@ -45,10 +45,6 @@ def has_dynamic_shadowing(**kwargs):
 
     def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file."""
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
 
         self._dynamic_shadowing = self.has_dynamic_shadowing(**kwargs)
         super(FormatCBFMiniEigerDLS16MSN160, self).__init__(image_file, **kwargs)

format/FormatCBFMiniEigerPetraP14.py

@@ -33,19 +33,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMiniEiger.__init__(self, image_file, **kwargs)
-
-        self._raw_data = None
-
     def _goniometer(self):
         return self._goniometer_factory.known_axis((0, 1, 0))
 

format/FormatCBFMiniEigerPhotonFactory.py

@@ -37,22 +37,6 @@ def understand(image_file):
             return True
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMini.__init__(self, image_file, **kwargs)
-
-        return
-
-    def _start(self):
-        FormatCBFMini._start(self)
-
     def _goniometer(self):
         return self._goniometer_factory.make_goniometer(
             (1, 0, 0), (1, 0, 0, 0, 1, 0, 0, 0, 1)

format/FormatCBFMiniPilatus.py

@@ -50,22 +50,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMini.__init__(self, image_file, **kwargs)
-
-        return
-
-    def _start(self):
-        FormatCBFMini._start(self)
-
     def _detector(self):
         """Return a model for a simple detector, presuming no one has
         one of these on a two-theta stage. Assert that the beam centre is

format/FormatCBFMiniPilatus3APS19ID6MSN132.py

@@ -31,19 +31,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMiniPilatus.__init__(self, image_file, **kwargs)
-
-        return
-
     def _goniometer(self):
         """19ID has reversed goniometer"""
 

format/FormatCBFMiniPilatusCHESS_6MSN127.py

@@ -31,19 +31,6 @@ def understand(image_file):
 
         return False
 
-    def __init__(self, image_file, **kwargs):
-        """Initialise the image structure from the given file, including a
-        proper model of the experiment."""
-
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
-        FormatCBFMiniPilatus.__init__(self, image_file, **kwargs)
-
-        return
-
     def _goniometer(self):
         """Return a model for a simple single-axis reversed direction goniometer."""
 

format/FormatCBFMiniPilatusDLS12M.py

@@ -49,20 +49,13 @@ def __init__(self, image_file, **kwargs):
         """Initialise the image structure from the given file, including a
         proper model of the experiment."""
 
-        from dxtbx import IncorrectFormatError
-
-        if not self.understand(image_file):
-            raise IncorrectFormatError(self, image_file)
-
         # if multi_panel == False, then interpret data as 24 panels, where each
         # row of 5 panels is grouped as one "panel"
         # elif multi_panel == True, then interpret data as 120 panels,
         # 24 rows * 5 columns
         self._dynamic_shadowing = self.has_dynamic_shadowing(**kwargs)
         self._multi_panel = kwargs.get("multi_panel", False)
-        FormatCBFMiniPilatus.__init__(self, image_file, **kwargs)
-
-        self._raw_data = None
+        super(FormatCBFMiniPilatusDLS12M, self).__init__(image_file, **kwargs)
 
     def _detector(self):