work

Elena.Budnik
1 parent c58abd8b
Showing 4 changed files with 14 additions and 14 deletions Show diff stats
Bin.py/log
Bin.py/run.py
env.sh
runRequest
@@ -0,0 +1,9 @@
+2016-06-24 00:00:00
+2016-01-20 00:00:00
+New mission start : 2016-01-20T00:00:00
+New mission stop  : 2016-06-24T00:00:00
+Database has to be updated
+1 file will be producted
+XML Start : 2016-01-01T00:00:00
+XML Stop : 2016-06-24T00:00:00
+You can work 4.5 hours in this session.
@@ -14,11 +14,10 @@ def main():
 	J2000REF = 946679400 # 2000-01-01T00:00:00 -30min
  
 	# CHECK ARGS
-	checkArgs(4, 'Usage : python run.py (target) (plasma src) (Solar Wind XML config file)')
+	checkArgs(3, 'Usage : python run.py (target) (Solar Wind XML config file)')
  
 	prefix =  sys.argv[1]
-	src =  sys.argv[2]
-	xmlFile = sys.argv[3]
+	xmlFile = sys.argv[2]
  
 	start_time = myTime.time()
  
@@ -30,6 +29,7 @@ def main():
  
 	# GET INFOS FROM XML CONFIG FILE
 	start,stop,plasmaVi,srcVi,srcR,srcLon,tgtVi,tgtR,tgtLon = getXMLConfig(xmlFile)
+       src = plasmaVi.split('_')[0]
  
 	# CREATE A DIRECTORY FOR THE NEW QUERY
 	MYDIR = SW2DATA+'/'+src+'/'+prefix+'_'+datetime.now().strftime('%Y%m%d')
 #!/bin/bash
  
-# SOFT ROOT
+# SOFT ROOT 
 export SW2ROOT=/home/budnik/SolarWind
  
 export DDUSER=budnik
@@ -9,15 +9,6 @@ SwStop=$5
  
 . $(dirname $BASH_SOURCE)/env.sh
  
- case $src_vi in
-	omni_hour_all)
-		src=omni
-	;; 
-	ace_swepam_real)
-		src=ace
-	;;
- esac
-
  # delete results of previous calculations
  rm -rf $SW2NC/$tgt* $SW2DATA/$src/$tgt*
  
@@ -31,6 +22,6 @@ SwStop=$5
  # run newly created Request
  for request in $REQ/$tgt*.xml
   do
-	python run.py $tgt $src $request & echo $!
+	python run.py $tgt $request & echo $!
   done
  
 \ No newline at end of file