(file) Return to soshdata.py CVS log (file) (dir) Up to [Development] / JSOC / proj / globalhs / sosh

Diff for /JSOC/proj/globalhs/sosh/soshdata.py between version 1.1 and 1.2

version 1.1, 2019/02/22 22:26:26 version 1.2, 2019/02/24 18:34:11
Line 11  warnings.simplefilter(action='ignore', c
Line 11  warnings.simplefilter(action='ignore', c
 #datadir = '/home/tplarson/solar/data' #datadir = '/home/tplarson/solar/data'
 datadir = '../data' datadir = '../data'
  
 def getmodeparms(instrument=None, day=None, lmin=0, lmax=300):  def getmodeparms(instrument=None, day=None, lmin=0, lmax=300, makemsplit=True):
  
   if not os.path.exists(datadir):   if not os.path.exists(datadir):
     os.makedirs(datadir)     os.makedirs(datadir)
Line 30  def getmodeparms(instrument=None, day=No
Line 30  def getmodeparms(instrument=None, day=No
   if (mfile == None):   if (mfile == None):
     return None     return None
  
     if (makemsplit):
   msfile=mfile+'.msplit'   msfile=mfile+'.msplit'
  
   if os.path.exists(msfile):   if os.path.exists(msfile):
Line 38  def getmodeparms(instrument=None, day=No
Line 39  def getmodeparms(instrument=None, day=No
     msfile=mkmsplit(mfile,lmin=lmin,lmax=lmax)     msfile=mkmsplit(mfile,lmin=lmin,lmax=lmax)
  
   return mfile,msfile   return mfile,msfile
     else:
       return mfile
  
  
 def getmfile(inst, daystr): def getmfile(inst, daystr):


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

Karen Tian
Powered by
ViewCVS 0.9.4