@@ -364,25 +364,23 @@ def read_metadata(self, seq_dir):
364364 # reboot time if we want to use acquisition time
365365 # timereboot=globalattr['datetime']
366366 # look for latitude and longitude or lat and lon , more elegant way??
367- if 'latitude' in globalattr .keys ():
368- lat = globalattr ['latitude' ]
367+ if 'latitude' in (globalattr .keys ()):
368+ lat = float (globalattr ['latitude' ])
369+ elif 'lat' in (globalattr .keys ()):
370+ lat = float (globalattr ['lat' ])
369371 else :
370- lat = globalattr ['lat' ]
371-
372- if not lat .isdigit ():
373372 print ("Latitude is not given, use default" )
374- lat = self .context .get_config_value ("lat" )
375- flag = flag + 2 ** self .context .get_config_value ("lat_default" )
373+ lat = self .context .get_config_value ("lat" )
374+ flag = flag + 2 ** self .context .get_config_value ("lat_default" )
376375
377- if 'longitude' in globalattr .keys ():
378- lon = globalattr ['longitude' ]
376+ if 'longitude' in (globalattr .keys ()):
377+ lon = float (globalattr ['longitude' ])
378+ elif 'lon' in (globalattr .keys ()):
379+ lon = float (globalattr ['lon' ])
379380 else :
380- lon = globalattr ['lon' ]
381-
382- if not lon .isdigit ():
383381 print ("Longitude is not given, use default" )
384- lon = self .context .get_config_value ("lon" )
385- flag = flag + 2 ** self .context .get_config_value ("lon_default" )
382+ lon = self .context .get_config_value ("lon" )
383+ flag = flag + 2 ** self .context .get_config_value ("lon_default" )
386384
387385 # 2. Estimate wavelengths - NEED TO CHANGE HERE!!!!!!
388386 # ----------------------
0 commit comments