DATABASES/madrigal Commit - r3:83075d03134d

Optmize plots mods

jespinoza -

r3:83075d03134d

parent child

Context file:

r3:83075d03134d

source/madpy/djangoMad/madweb/forms.py +18 -73

                                                                          required=False)
              '''get_params2 retrieves a list of 1d and 2d parameters of type 1 hdf5 files'''
+             def check_mnemonic(s):
+                 return s.replace('+', '%2b')
              def get_params1(args, kwargs, madExpObj, madWebObj):
                  expID = getSelection('experiment_list', args, kwargs)
                  basename = firsttuple[0]
                  fullFilename = os.path.join(expDir, basename)
                  f = h5py.File(fullFilename, "r")
-                 data = f[list(f.keys())[0]]
-                 array = data[list(data.keys())[0]]
-                 param1d = array[list(array.keys())[0]]
-                 param2d = array[list(array.keys())[1]]
-                 paramch1d = list(param1d.keys())
-                 paramch2d = list(param2d.keys())
-                 dataparameters = param1d[list(param1d.keys())[0]]
-                 paramch_mn_bin = list(dataparameters['mnemonic'])
-                 paramch_bin = list(dataparameters['description'])
-                 paramch_mn = list()
-                 paramch = list()
-                 for i in range(len(paramch_bin)):
-                     paramch_mn.append(paramch_mn_bin[i].decode("utf-8"))
-                     paramch.append(paramch_bin[i].decode("utf-8"))
-                 choices1d = ['Select parameter']
-                 for ch in paramch1d[1:]:
-                     aux = paramch[paramch_mn.index(ch.upper())]
-                     choices1d.append(aux)
-                 dataparameters = param2d[list(param2d.keys())[0]]
-                 paramch_mn_bin = list(dataparameters['mnemonic'])
-                 paramch_mn = list()
-                 paramch_bin = list(dataparameters['description'])
-                 paramch = list()
-                 for i in range(len(paramch_bin)):
-                     paramch_mn.append(paramch_mn_bin[i].decode("utf-8"))
-                     paramch.append(paramch_bin[i].decode("utf-8"))
-                 choices2d = ['Select parameter']
-                 for ch in paramch2d[1:]:
-                     aux = paramch[paramch_mn.index(ch.upper())]
-                     choices2d.append(aux)
-                 choices = [choices1d,choices2d]
+                 data = f['Data']
+                 choices1d = [(check_mnemonic(x[0].decode().lower()), x[1].decode()) for x in data['Array Layout']['1D Parameters']['Data Parameters']]
+                 choices2d = [(check_mnemonic(x[0].decode().lower()), x[1].decode()) for x in data['Array Layout']['2D Parameters']['Data Parameters']]
+                 choices = [[('0', 'Select Parameter')] + choices1d, [('0', 'Select Parameter')] + choices2d]
+                 f.close()
                  return choices
                  basename = firsttuple[0]
                  fullFilename = os.path.join(expDir, basename)
                  f = h5py.File(fullFilename, "r")
-                 metadata = f[list(f.keys())[1]]
-                 table = metadata[list(metadata.keys())[0]]
-                 param_mn_bin = list(table['mnemonic'])
-                 param_mn = list()
-                 for p in param_mn_bin:
-                     param_mn.append(p.decode("utf"))
-                 index = param_mn.index('UT2_UNIX')
-                 params = list(table['description'])
-                 choices = ['Select parameter']
-                 for p in params[index+1:]:
-                     choices.append(p.decode("utf-8"))
-                 return choices
+                 parameters = [(x[0].decode().lower(), x[1].decode()) for x in f['Metadata']['Data Parameters']]
+                 f.close()
+                 return [('0', 'Select Parameter')] + parameters
              class SingleExpPlotsSelectionForm(django.forms.Form):
                          choices = get_params1(args, kwargs, madExpObj, madWebObj)
                          params1d = choices[0]
                          params2d = choices[1]
-                         index = list(range(len(params1d)))
-                         paramchoices1d = list(zip(index, params1d))
-                         index = list(range(len(params2d)))
-                         paramchoices2d = list(zip(index, params2d))
-                         self.fields['param_list2d'] = django.forms.ChoiceField(widget = django.forms.Select(), choices=paramchoices2d, label="2D Parameters", required=False)
+                         self.fields['param_list1d'] = django.forms.ChoiceField(widget = django.forms.Select(), choices=params1d, label="1D Parameters", required=False)
+                         self.fields['param_list2d'] = django.forms.ChoiceField(widget = django.forms.Select(), choices=params2d, label="2D Parameters", required=False)
                      else:
                          params1d = get_params2(args, kwargs, madExpObj, madWebObj)
-                         #if params1d[0] == 'ut2_unix':
-                          #   params1d[0] = 'Select parameter'
-                         index = list(range(len(params1d)))
-                         paramchoices1d = list(zip(index, params1d))
-                     self.fields['param_list1d'] = django.forms.ChoiceField(widget = django.forms.Select(), choices=paramchoices1d, label="1D Parameters", required=False)
+                         self.fields['param_list1d'] = django.forms.ChoiceField(widget = django.forms.Select(), choices=params1d, label="1D Parameters", required=False)
              class SingleExpDownloadAsIsForm(django.forms.Form):
                  """SingleExpDownloadAsIsForm is a Form class for the download as is field in the Single Experiment interface.
                  Use this because its faster to create than the full SingleExpDefaultForm

source/madpy/djangoMad/madweb/templates/madweb/show_experiment.html +1 0

              {% block title %}Show Madrigal experiment{% endblock %}
              {% block extra_head %}
+             	<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
                  <script>
                      function changeFile (select) {

source/madpy/djangoMad/madweb/views.py +18 -35

              def view_plot(request):
-                 param1d = int(request.GET.get('param1d','0'))
-                 param2d = int(request.GET.get('param2d','0'))
+                 param1d = request.GET.get('param1d', 0)
+                 param2d = request.GET.get('param2d', 0)
                  madDB = madrigal.metadata.MadrigalDB()
                  madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
                      # Get the data
-                     data = f[list(f.keys())[0]]
+                     data = f['Data']
-                     if 'Array Layout' in list(data.keys()):
-                         array = data[list(data.keys())[0]]
-                         timestamps = array[list(array.keys())[4]]
-                         datatime = [datetime.datetime.fromtimestamp(t) for t in list(timestamps)]
-                         range = array[list(array.keys())[3]]
-                         datarange = list(range)
+                     if 'Array Layout' in data:
+                         array = data['Array Layout']
+                         datatime = [datetime.datetime.fromtimestamp(t) for t in array['timestamps']]
+                         yrange = array['gdalt']
                          if param1d==0:
-                             parameters_2d = array[list(array.keys())[1]]
-                             paramname = list(parameters_2d.keys())[param2d]
-                             param = parameters_2d[list(parameters_2d.keys())[param2d]]
-                             dataparam = list(param)
-                             plot = plot_heatmap(datatime,datarange,dataparam,paramname)
+                             plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d)
                          else:
-                             parameters_1d = array[list(array.keys())[0]]
-                             paramname = list(parameters_1d.keys())[param1d]
-                             param = parameters_1d[list(parameters_1d.keys())[param1d]]
-                             dataparam = list(param)
-                             plot = plot_scatter(datatime,dataparam,paramname)
+                             plot = plot_scatter(datatime, array['1D Parameters'][param1d], param1d)
                      else:
-                         table = data[list(data.keys())[0]]
-                         a = list(table.dtype.fields.keys())
-                         index = a.index('ut2_unix')
-                         v = a[index:]
-                         paramname = v[param1d]
-                         dataparam = list(table[paramname])
-                         datatime = [datetime.datetime.fromtimestamp(t) for t in list(table['ut2_unix'])]
-                         plot = plot_scatter(datatime,dataparam,paramname)
+                         table = data['Table Layout']
+                         datatime = [datetime.datetime.fromtimestamp(t) for t in table['ut2_unix']]
+                         plot = plot_scatter(datatime,table[param1d],param1d)
                  return HttpResponse(plot)
              def plot_heatmap(datatime,datarange,dataparam,paramname):
-                 if (numpy.isnan(dataparam).all()):
+                 if (numpy.all(numpy.isnan(dataparam))):
                      plot = "There is no valid data available for this plot"
                  else:
                      fig = go.Figure()
                                  ]),
                                  type = "dropdown",
                                  direction="down",
-                                 pad={"r": 10, "t": 10},
+                                 pad={"r": 10, "t": -10},
                                  showactive=True,
                                  x=0.1,
                                  xanchor="left",
                                      ),
                                  ]),
                                  direction="down",
-                                 pad={"r": 10, "t": 10},
+                                 pad={"r": 10, "t": -10},
                                  showactive=True,
                                  x=0.32,
                                  xanchor="left",
                                  y=1.05,
                                  yanchor="top"
                              ),
                          ]
                      )
                      fig.update_layout(
                          annotations=[
                              dict(text="Colorscale", showarrow=False,
-                                                 x=0, xref="paper", y=1.03, yref="paper", align="left"),
-                             dict(text="Lines", x=0.25, xref="paper", y=1.03, yref="paper",
+                                                 x=0, xref="paper", y=1.05, yref="paper", align="left"),
+                             dict(text="Lines", x=0.25, xref="paper", y=1.05, yref="paper",
                                           showarrow=False)
                          ]
                      )

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages