From fe2591aabdb08f2a3dbd8453c02d9339db8c89d0 Mon Sep 17 00:00:00 2001 From: Dario Barghini <dario.barghini@inaf.it> Date: Thu, 22 May 2025 16:01:48 +0200 Subject: [PATCH] Fixed filenames (1) --- pysqm/plot.py | 2 +- pysqm/read.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pysqm/plot.py b/pysqm/plot.py index a106eeb..1e0041c 100644 --- a/pysqm/plot.py +++ b/pysqm/plot.py @@ -830,7 +830,7 @@ def make_plot(input_filename=None,send_emails=False,write_stats=False): output_filenames = [\ str("%s/%s_%s.png" %(config.current_data_directory,\ config._device_shorttype,config._observatory_name)),\ - str("%s/%s_%s-%s.png"\ + str("%s/%s_%s_%s.png"\ %(config.daily_graph_directory+str(NSBData.Night)[0:7].replace('-',''),\ str(NSBData.Night).replace('-',''),config._device_shorttype, config._observatory_name))\ ] diff --git a/pysqm/read.py b/pysqm/read.py index 6724f09..71cba30 100644 --- a/pysqm/read.py +++ b/pysqm/read.py @@ -190,12 +190,11 @@ class device(observatory): self.yearmonthday = yearmonthday self.monthly_datafile = \ - config.monthly_data_directory+"/"+config._device_shorttype+\ - "_"+config._observatory_name+"_"+yearmonth+".dat" + config.monthly_data_directory+"/"+yearmonth+"_"+\ + config._device_shorttype+"_"+config._observatory_name+"_"+".dat" self.daily_datafile = \ config.daily_data_directory+"/"+yearmonth+"/"+\ - "_"+config._device_shorttype+'_'+config._observatory_name+\ - "_"+yearmonthday+'.dat' + yearmonthday+"_"+config._device_shorttype+"_"+config._observatory_name+'.dat' self.current_datafile = \ config.current_data_directory+"/"+config._device_shorttype+\ "_"+config._observatory_name+".dat" -- GitLab