diff --git a/config.py b/config.py index 9e2f2ec0118d7990dfb2db5936cac8db59d0cdb3..6b7b0986fdc8641173da1fac8368781243dee05f 100644 --- a/config.py +++ b/config.py @@ -49,7 +49,7 @@ DEVICE specs ''' _device_shorttype = 'SQM' # Device STR in the file _device_type = 'SQM_LE' # Device type in the Header -_device_id = _device_type + '-' + _observatory_name # Long Device lame +_device_id = _device_type + '_' + _observatory_name # Long Device lame _device_locationname = 'Pino Torinese/Italy - Astrophysical Observatory of Torino' # Device location in the world _data_supplier = 'Dario Barghini / INAF - OATo' # Data supplier (contact) _device_addr = '169.254.65.200' # Default IP address of the ethernet device (if not automatically found) diff --git a/pysqm/read.py b/pysqm/read.py index f76d70a26cfd0b1aa6a27e78c265fdade1dbda5e..6724f09a69acdacc933cbdb5fe3227d86bd8a622 100644 --- a/pysqm/read.py +++ b/pysqm/read.py @@ -190,15 +190,12 @@ class device(observatory): self.yearmonthday = yearmonthday self.monthly_datafile = \ - config.monthly_data_directory+"/"+config._device_shorttype+\ + config.monthly_data_directory+"/"+config._device_shorttype+\ "_"+config._observatory_name+"_"+yearmonth+".dat" - #self.daily_datafile = \ - # config.daily_data_directory+"/"+config._device_shorttype+\ - # "_"+config._observatory_name+"_"+yearmonthday+".dat" self.daily_datafile = \ config.daily_data_directory+"/"+yearmonth+"/"+\ - yearmonthday.replace('-','')+\ - config._device_shorttype+'-'+config._observatory_name+'.dat' + "_"+config._device_shorttype+'_'+config._observatory_name+\ + "_"+yearmonthday+'.dat' self.current_datafile = \ config.current_data_directory+"/"+config._device_shorttype+\ "_"+config._observatory_name+".dat"