Commit e48048ed4b2f699c881145e83a19e9e182b4a68e
Exists in
master
Merge branch 'master' of https://gitlab.irap.omp.eu/guitastrolib/guitastro
# Conflicts: # src/guitastro/filenames.py
Showing
1 changed file
with
12 additions
and
0 deletions
Show diff stats
src/guitastro/filenames.py
| ... | ... | @@ -1939,7 +1939,11 @@ class FileNames(FileNamesException, GuitastroTools): |
| 1939 | 1939 | nkw = self.naming_get(fname) |
| 1940 | 1940 | return pkw, nkw |
| 1941 | 1941 | |
| 1942 | +<<<<<<< HEAD | |
| 1942 | 1943 | def subdir_from_filename(self, filename:str)->str: |
| 1944 | +======= | |
| 1945 | + def path_from_filename(self, filename:str)->str: | |
| 1946 | +>>>>>>> c9014f0286412f8f7c9b0b6246ce94331c9dcb2a | |
| 1943 | 1947 | path = os.path.dirname(filename) |
| 1944 | 1948 | if self.fcontext_value('pathnaming') == self.NAMING_PYROS_IMG1: |
| 1945 | 1949 | nkw = self.naming_get(filename) |
| ... | ... | @@ -3070,7 +3074,11 @@ if __name__ == "__main__": |
| 3070 | 3074 | fn.pathnaming("PyROS.img.1") |
| 3071 | 3075 | fn.rootdir = "/tmp" |
| 3072 | 3076 | in_fullname = r"/srv/work/L0A_20211026_134522999983_1_TNC_CH1_0123456789_001_001.fits.gz" |
| 3077 | +<<<<<<< HEAD | |
| 3073 | 3078 | path = fn.subdir_from_filename(in_fullname) |
| 3079 | +======= | |
| 3080 | + path = fn.path_from_filename(in_fullname) | |
| 3081 | +>>>>>>> c9014f0286412f8f7c9b0b6246ce94331c9dcb2a | |
| 3074 | 3082 | print(f"path={path}") |
| 3075 | 3083 | |
| 3076 | 3084 | if example == 11: |
| ... | ... | @@ -3163,7 +3171,11 @@ if __name__ == "__main__": |
| 3163 | 3171 | # --- Place a sequence at the good place |
| 3164 | 3172 | fn.fcontext = "pyros_seq" |
| 3165 | 3173 | in_fullname = r"/srv/work/P001_20211026_1_TNC_0123456789.p" |
| 3174 | +<<<<<<< HEAD | |
| 3166 | 3175 | subdir = fn.subdir_from_filename(in_fullname) |
| 3176 | +======= | |
| 3177 | + subdir = fn.path_from_filename(in_fullname) | |
| 3178 | +>>>>>>> c9014f0286412f8f7c9b0b6246ce94331c9dcb2a | |
| 3167 | 3179 | out_fullname = fn.join() |
| 3168 | 3180 | print(f"\n==== Copy sequence in the good path (context {fn.fcontext_value('description')}) ====") |
| 3169 | 3181 | print(f"{in_fullname=:}") | ... | ... |