@@ -122,18 +122,35 @@ def post_transfer(
122122 name = lamella_name ,
123123 number = lamella_number ,
124124 )
125+ if not (source := _get_source (transferred_file , environment )):
126+ logger .warning (f"No source found for file { transferred_file } " )
127+ return
128+ if not (
129+ destination_file := _file_transferred_to (
130+ environment = environment ,
131+ source = source ,
132+ file_path = transferred_file ,
133+ rsync_basepath = Path (
134+ self ._machine_config .get ("rsync_basepath" , "" )
135+ ),
136+ )
137+ ):
138+ logger .warning (
139+ f"File { transferred_file .name !r} not found on storage system"
140+ )
141+ return
125142 if not self ._milling .get (lamella_number ):
126143 self ._milling [lamella_number ] = [
127144 MillingProgress (
128145 timestamp = timestamp ,
129- file = transferred_file ,
146+ file = destination_file ,
130147 )
131148 ]
132149 else :
133150 self ._milling [lamella_number ].append (
134151 MillingProgress (
135152 timestamp = timestamp ,
136- file = transferred_file ,
153+ file = destination_file ,
137154 )
138155 )
139156 gif_list = [
@@ -142,25 +159,24 @@ def post_transfer(
142159 self ._milling [lamella_number ], key = lambda x : x .timestamp
143160 )
144161 ]
145- if environment :
146- raw_directory = Path (
147- environment .default_destinations [self ._basepath ]
148- ).name
149- # Submit job to backend to construct a GIF
150- capture_post (
151- base_url = str (environment .url .geturl ()),
152- router_name = "workflow.correlative_router" ,
153- function_name = "make_gif" ,
154- token = self ._token ,
155- year = datetime .now ().year ,
156- visit_name = environment .visit ,
157- session_id = environment .murfey_session ,
158- data = {
159- "lamella_number" : lamella_number ,
160- "images" : [str (file ) for file in gif_list ],
161- "raw_directory" : raw_directory ,
162- },
163- )
162+ raw_directory = Path (
163+ environment .default_destinations [self ._basepath ]
164+ ).name
165+ # Submit job to backend to construct a GIF
166+ capture_post (
167+ base_url = str (environment .url .geturl ()),
168+ router_name = "workflow.correlative_router" ,
169+ function_name = "make_gif" ,
170+ token = self ._token ,
171+ year = datetime .now ().year ,
172+ visit_name = environment .visit ,
173+ session_id = environment .murfey_session ,
174+ data = {
175+ "lamella_number" : lamella_number ,
176+ "images" : [str (file ) for file in gif_list ],
177+ "raw_directory" : raw_directory ,
178+ },
179+ )
164180 elif transferred_file .name == "ProjectData.dat" :
165181 with open (transferred_file , "r" ) as dat :
166182 try :
0 commit comments