From fcb8abd78838a533a64d5c38cf9dec123cacd004 Mon Sep 17 00:00:00 2001
From: Dario Barghini <dario.barghini@inaf.it>
Date: Thu, 22 May 2025 15:46:24 +0200
Subject: [PATCH] Fixed filenames
---
config.py | 2 +-
pysqm/read.py | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/config.py b/config.py
index 9e2f2ec..6b7b098 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 f76d70a..6724f09 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"
--
GitLab