Fixed filenames

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)

pysqm/read.py

@@ -192,13 +192,10 @@ class device(observatory):
         self.monthly_datafile = \
         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"