replace DEFAULT_DATA_DATA_PATH_PATTERN by DEFAULT_DATA_PATH_PATTERN and...

replace DEFAULT_DATA_DATA_PATH_PATTERN by DEFAULT_DATA_PATH_PATTERN and DEFAULT_METADATA_DATA_PATH_PATTERN by EFAULT_METADATA_PATH_PATTERN. close #63

tomoscan/esrf/volume/singleframebase.py

@@ -54,14 +54,14 @@ class VolumeSingleFrameBase(VolumeBase):
 
     DEFAULT_DATA_SCHEME = None
 
-    DEFAULT_DATA_DATA_PATH_PATTERN = "{volume_basename}_{index_zfill4}.{data_extension}"
+    DEFAULT_DATA_PATH_PATTERN = "{volume_basename}_{index_zfill4}.{data_extension}"
 
     DEFAULT_METADATA_EXTENSION = "txt"
 
     # information regarding metadata
     DEFAULT_METADATA_SCHEME = "ini"
 
-    DEFAULT_METADATA_DATA_PATH_PATTERN = "{volume_basename}_infos.{metadata_extension}"
+    DEFAULT_METADATA_PATH_PATTERN = "{volume_basename}_infos.{metadata_extension}"
 
     def __init__(
         self,
@@ -117,7 +117,7 @@ class VolumeSingleFrameBase(VolumeBase):
                 "volume_basename": self.get_volume_basename(url),
                 "metadata_extension": self.metadata_extension,
             }
-            metadata_data_path = self.DEFAULT_METADATA_DATA_PATH_PATTERN.format(
+            metadata_data_path = self.DEFAULT_METADATA_PATH_PATTERN.format(
                 **metadata_keywords
             )
 
@@ -125,7 +125,7 @@ class VolumeSingleFrameBase(VolumeBase):
                 # data url
                 DataUrl(
                     file_path=url.file_path(),
-                    data_path=self.DEFAULT_DATA_DATA_PATH_PATTERN,
+                    data_path=self.DEFAULT_DATA_PATH_PATTERN,
                     scheme=url.scheme() or self.DEFAULT_DATA_SCHEME,
                     data_slice=url.data_slice(),
                 ),

tomoscan/esrf/volume/test/test_tiffvolume.py

@@ -227,7 +227,7 @@ def test_tiff_volume_nabu_single_frame_pattern(tmp_path):
 
     class SingleFrameTIFFVolume(TIFFVolume):
         # we are not insure that the output directory name is the base name of the file_path
-        DEFAULT_DATA_DATA_PATH_PATTERN = "frame.tiff"
+        DEFAULT_DATA_PATH_PATTERN = "frame.tiff"
 
     frame = _data[0].reshape(1, _data.shape[1], _data.shape[2])
     volume = SingleFrameTIFFVolume(
@@ -300,7 +300,7 @@ def test_tiff_volume_nabu_multi_frame_pattern(tmp_path):
 
     class MultiFrameTIFFVolume(TIFFVolume):
         # we are not insure that the output directory name is the base name of the file_path
-        DEFAULT_DATA_DATA_PATH_PATTERN = "frame_{index_zfill4}.tiff"
+        DEFAULT_DATA_PATH_PATTERN = "frame_{index_zfill4}.tiff"
 
     volume = MultiFrameTIFFVolume(
         folder=test_dir,