(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.2 and 1.3

version 1.2, 2019/02/24 18:34:11 version 1.3, 2019/03/04 17:33:22
Line 47  def getmfile(inst, daystr):
Line 47  def getmfile(inst, daystr):
  
   if (inst == 'hmi'):   if (inst == 'hmi'):
     qblank = 'hmi.V_sht_modes[{:d}d][0][300][138240]'     qblank = 'hmi.V_sht_modes[{:d}d][0][300][138240]'
     mblank = 'hmi.%sd.modes'  
     avgurl = 'http://sun.stanford.edu/~tplarson/audio/HMI/hmi.average.modes'     avgurl = 'http://sun.stanford.edu/~tplarson/audio/HMI/hmi.average.modes'
   elif (inst == 'mdi'):   elif (inst == 'mdi'):
     qblank = 'mdi.vw_V_sht_modes[{:d}d][0][300][103680]'     qblank = 'mdi.vw_V_sht_modes[{:d}d][0][300][103680]'
     mblank = 'mdi.%sd.modes'  
     avgurl = 'http://sun.stanford.edu/~tplarson/audio/MDI/mdi.average.modes'     avgurl = 'http://sun.stanford.edu/~tplarson/audio/MDI/mdi.average.modes'
   else:   else:
     print("Invalid instrument, try again.")     print("Invalid instrument, try again.")
     return None     return None
  
   mblank = '%s.%sd.modes'    if (daystr == 'average'):
   mfile=os.path.join(datadir,mblank % (inst, daystr))      mblank = '%s.average.modes'
       mfile=os.path.join(datadir,mblank % inst)
   if os.path.exists(mfile):   if os.path.exists(mfile):
     print("Mode fits file already exists.")     print("Mode fits file already exists.")
   elif (daystr == 'average'):      else:
     try:     try:
       urlretrieve(avgurl, mfile)       urlretrieve(avgurl, mfile)
     except:     except:
       print("Failure of urlretrieve() for %s." % avgurl)       print("Failure of urlretrieve() for %s." % avgurl)
       return None       return None
   else:   else:
       mblank = '%s.%sd.modes'
       mfile=os.path.join(datadir,mblank % (inst, daystr))
       if os.path.exists(mfile):
         print("Mode fits file already exists.")
       else:
     try:     try:
       day=int(daystr)       day=int(daystr)
     except:     except:


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

Karen Tian
Powered by
ViewCVS 0.9.4