release 1.1

cmoestl · Aug 17, 2020 · 9384747 · 9384747
1 parent 57d12b0
commit 9384747
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/config.py b/config.py
@@ -6,12 +6,12 @@
 #for in situ data folder
 
 #standard
-#data_path='data/' 
-#data_path_ML='data/ML/'
+data_path='data/' 
+data_path_ML='data/ML/'
 
 #e.g. server
-data_path='/nas/helio/data/insitu_python/'
-data_path_ML='/nas/helio/data/insitu_python/ML_struct_arrays/'
+#data_path='/nas/helio/data/insitu_python/'
+#data_path_ML='/nas/helio/data/insitu_python/ML_struct_arrays/'
 
 
 
diff --git a/dist/heliocats-1.0-py3-none-any.whl b/dist/heliocats-1.0-py3-none-any.whl
diff --git a/dist/heliocats-1.0.tar.gz b/dist/heliocats-1.0.tar.gz
diff --git a/dist/heliocats-1.1-py3-none-any.whl b/dist/heliocats-1.1-py3-none-any.whl
diff --git a/dist/heliocats-1.1.tar.gz b/dist/heliocats-1.1.tar.gz
diff --git a/sc_positions_insitu.py b/sc_positions_insitu.py
@@ -34,8 +34,8 @@
 
 ffmpeg_path=''
 #where the in situ data are located
-data_path='/nas/helio/data/insitu_python/'
-#data_path='data/'
+#data_path='/nas/helio/data/insitu_python/'
+data_path='data/'
 
 
 #import scipy.io
@@ -604,9 +604,9 @@ def make_frame(k):
 
     #save figure
     framestr = '%05i' % (k)  
-    filename=outputdirectory+'/pos_anim_'+framestr+'.jpg'  
+    filename=outputdirectory+'/pos_anim_'+framestr+'.pdf'  
     if k==0: print(filename)
-    plt.savefig(filename,dpi=100,facecolor=fig.get_facecolor(), edgecolor='none')
+    plt.savefig(filename,dpi=300,facecolor=fig.get_facecolor(), edgecolor='none')
     #plt.clf()
     plt.close('all')
 
@@ -674,10 +674,10 @@ def make_frame(k):
 #t_end   ='2018-Dec-06'
 #orbit all
 
-outputdirectory='results/plots_wind_psp_sta_april2020_1'
-animdirectory='results/movie_wind_psp_sta_april2020_1'
-t_start ='2018-Oct-01'
-t_end   ='2019-Dec-28'
+outputdirectory='results/plots_weiss_2020'
+animdirectory='results/movie_weiss_2020'
+t_start ='2018-Nov-12'
+t_end   ='2018-Nov-20'
 
 
 #Time resolution
@@ -863,8 +863,8 @@ def make_frame(k):
 print('time in min: ',np.round((time.time()-start_time)/60))
 print('plots done, frames saved in ',outputdirectory)
 
-os.system(ffmpeg_path+'ffmpeg -r 25 -i '+str(outputdirectory)+'/pos_anim_%05d.jpg -b 5000k \
-    -r 25 '+str(animdirectory)+'/psp_sta_wind_oct_2018_dec_2019.mp4 -y -loglevel quiet')
+#os.system(ffmpeg_path+'ffmpeg -r 25 -i '+str(outputdirectory)+'/pos_anim_%05d.jpg -b 5000k \
+#    -r 25 '+str(animdirectory)+'/psp_sta_wind_oct_2018_dec_2019.mp4 -y -loglevel quiet')
 
-print('movie done, saved in ',animdirectory)
+#print('movie done, saved in ',animdirectory)
 
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="heliocats",
-    version="1.0",
+    version="1.1",
     author="Christian Moestl",
     author_email="christian.moestl@oeaw.ac.at",
     keywords=["geophysics", "heliophysics", "space weather"],