DATABASES/madrigal Commit - r6:7771bbd8f772

Fix bugs and plots

jespinoza -

r6:7771bbd8f772

parent child

Context file:

r6:7771bbd8f772

nginx/app.conf +7 -7

             }
             server {
-                listen 80;
+                listen 8080;
-                location / {
+                location /madrigal {
-                    proxy_http_version 1.1;
+                    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                    proxy_set_header Upgrade $http_upgrade;
+                    proxy_set_header Host $host;
-                    proxy_set_header Connection "upgrade";
                     proxy_redirect off;
+                    proxy_set_header X-Script-Name /madrigal;
                     proxy_pass http://djangomad;
                 }
-                location /static/ {
+                location /madrigal/static/ {
                     alias /static/;
                 }
-            }
  No newline at end of file

source/madpy/djangoMad/apps/updata/views.py +1 -1

             import madrigal.ui.web
             import madrigal.admin
-            @login_required
+            @login_required(login_url='/madrigal/accounts/login/')
             def index(request):
                 '''
                 Uploading experiments data view. Allows user to upload experiment files

source/madpy/djangoMad/djangoMad/settings.py +3 -3

             DEBUG = True
-            ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost']
+            ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost', '10.10.120.60']
             ADMINS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
             # URL prefix for static files.
             # Example: "http://media.lawrence.com/static/"
-            STATIC_URL = '/static/'
+            STATIC_URL = '/madrigal/static/'
             BOOTSTRAP3 = {
                 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
-                'jquery_url': '/static/jquery.min.js',
+                'jquery_url': '/madrigal/static/jquery.min.js',
                 'include_jquery': True,
             }

source/madpy/djangoMad/djangoMad/urls.py +5 -4

             import madweb.views
             urlpatterns = [
-                url(r'^', include('madweb.urls')),
+                url(r'^madrigal/', include('madweb.urls')),
                 url(r'^$', madweb.views.index),
-                url(r'^updata/', include('apps.updata.urls', namespace="updata")),
+                url(r'^madrigal/updata/', include('apps.updata.urls', namespace="updata")),
-                url(r'^accounts/', include('apps.login.urls', namespace="login")),
+                url(r'^madrigal/accounts/', include('apps.login.urls', namespace="login")),
-                url(r'^admin/', admin.site.urls),
+                url(r'^madrigal/admin/', admin.site.urls),
+             #   url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
             ]

source/madpy/djangoMad/madweb/forms.py +12 0

@@ -642,6 +642,18 class SingleExpPlotsForm(django.forms.Form):
642		642
643	def check_mnemonic(s):	643	def check_mnemonic(s):
644		644
		645	s.replace('vipe1', 'vipe')
		646	s.replace('vipe2', 'vipe')
		647	s.replace('vipn1', 'vipn')
		648	s.replace('vipn2', 'vipn')
		649	s.replace('vi72', 'vi7')
		650	s.replace('vi82', 'vi8')
		651	s.replace('dvipe1', 'dvipe')
		652	s.replace('dvipe2', 'dvipe')
		653	s.replace('dvipn1', 'dvipn')
		654	s.replace('dvipn2', 'dvipn')
		655	s.replace('dvi72', 'dvi7')
		656	s.replace('dvi82', 'dvi8')
645	return s.replace('+', '%2b')	657	return s.replace('+', '%2b')
646		658
647	def get_params1(args, kwargs, madExpObj, madWebObj):	659	def get_params1(args, kwargs, madExpObj, madWebObj):

source/madpy/djangoMad/madweb/static/favicon.ico binary modified 0 0

NO CONTENT: modified file, binary diff hidden

source/madpy/djangoMad/madweb/templates/madweb/admin.html +7 -7

             <!-- InstanceBeginEditable name="doctitle" -->
             <title>Madrigal administrator's guide</title>
             <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
-            <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
+            <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};
             <body>
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
             <!-- InstanceEndEditable -->
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>

source/madpy/djangoMad/madweb/templates/madweb/dev_contents.html +7 -7

             <!-- InstanceBeginEditable name="doctitle" -->
             <title>Madrigal developer's guide</title>
             <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
-            <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
+            <link href="{% static 'madrigal.css' %}" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};
             <body>
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal developer's guide <!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
             <!-- InstanceEndEditable -->
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+            	  <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal developer's guide<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>

source/madpy/djangoMad/madweb/templates/madweb/madContents.html +1 -1

             <head>
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
             <title>Madrigal documentation - v3.0</title>
-            <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
+            <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};

source/madpy/djangoMad/madweb/templates/madweb/madIntroduction.html +8 -8

             <title>Madrigal history</title>
             <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
             <!-- InstanceEndEditable -->
-            <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
+            <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};
             <body>
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Brief history of Madrigal <!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
             </center>
             <p>Madrigal is a database of ground-based measurements and models of   the Earth's upper atmosphere and ionosphere. It is the community database of the   Coupling, Energetics and Dynamics of Atmospheric Regions (<a href="http://cedarweb.vsp.ucar.edu/wiki/index.php/Main_Page">CEDAR</a>) program, which   is devoted to the characterization and understanding of the atmosphere above   about 60 km, with emphasis on the various processes that determine the basic   structure and composition of the atmosphere, and on the mechanisms that couple   different atmospheric regions. Instruments developed or upgraded under CEDAR   include interferometers, spectrometers, imagers, lidars and medium,   high-frequency and incoherent scatter radars.  The success of   CEDAR has been due, in large measure, to its ability to encourage collaborative   efforts coalescing observations, theory and modeling. The CEDAR community   includes about 800 scientists and students from around the world.</p>
             <p>From the inception of the CEDAR program in 1988, there has been a   great concern among the members of the CEDAR community to make the data   collected by the CEDAR instruments easily accessible for joint studies.   Consequently, a high priority was placed on establishing a repository for CEDAR   data and model results. An incoherent scatter radar database had been   established at the National Center for Atmospheric Research (NCAR) in 1985, and   this evolved into the CEDAR Database in 1989. By the end of 1997, it had grown   to include data from 44 instruments and 16 models. Over 200 users have requested   information from the Database. In 2012, the Madrigal database and the CEDAR database were combined into a single database system, the Madrigal CEDAR database, based at MIT Haystack Observatory.</p>
-            <p>A central element of the CEDAR Database is a standard data format.   With Madrigal 3.0 the file format is now Hdf5, with a well-defined layout and parameters. This new CEDAR Hdf5 format is described <a href="/static/CEDARMadrigalHdf5Format.pdf" target="_blank">here</a>. This format replaced the old <a href="/static/cedarFormat.pdf">16 bit integer based format</a> that evolved from the format used by the earlier incoherent scatter   database, which in turn evolved from an earlier version of Madrigal developed at the MIT Haystack   Observatory in 1980. </p>
+            <p>A central element of the CEDAR Database is a standard data format.   With Madrigal 3.0 the file format is now Hdf5, with a well-defined layout and parameters. This new CEDAR Hdf5 format is described <a href="/madrigal/static/CEDARMadrigalHdf5Format.pdf" target="_blank">here</a>. This format replaced the old <a href="/madrigal/static/cedarFormat.pdf">16 bit integer based format</a> that evolved from the format used by the earlier incoherent scatter   database, which in turn evolved from an earlier version of Madrigal developed at the MIT Haystack   Observatory in 1980. </p>
             <p>Haystack maintains and develops  the Madrigal CEDAR database as an open-source project with community contributions.  With the Madrigal CEDAR database, the site owner stores only their own data, which they can add to or update at any time. However, because the Madrigal database shares its metadata with all other Madrigal sites, users browsing any Madrigal site can search for data at any other Madrigal site. In addition, a central archival Madrigal site (<a href="http://cedar.openmadrigal.org" target="_self">cedar.openmadrigal.org</a>) archives all Madrigal sites and stores data not stored at other Madrigal sites.</p>
             <p>Madrigal data are arranged into &quot;experiments&quot;, which may contain   data files, images, documentation, links, etc.   A key feature of Madrigal is its  seamless integration   of archival and real-time data. A realtime file on Madrigal is accessed in exactly the same way as any archival file.</p>
             <p>Madrigal has been installed at numerous locations in addition to   Millstone Hill, including EISCAT, SRI International, and Jicamarca. The inventories of   experiments available at each installation are available to the other   installations through shared metadata.  New Madrigal sites can be automatically added at any time.</p>
             <!-- InstanceEndEditable -->
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Brief overview of Madrigal <!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>

source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html +3 -3

                     $('#id_param_list2d').bind('change', function (e) {
                             var expID = '{{ expID }}';
                             var param = $(this).val();
-                            var url =  '{% url 'plot' %}' + '?expID=' + expID + '&param2d=' + param;
+                            var url =  '{% url 'plot' %}' + '?expID=' + expID + '&param2d=' + param + '&filename=' + $('#id_file_list').val();
                             console.log(url)
                             // first delete all forms that are now out of date
             	        			divIndex = $(".single_form").index($( "#file_plot" ))
                   $('#id_param_list1d').bind('change', function (e) {
                             var expID = '{{ expID }}';
                             var param = $(this).val();
-                            var url =  '{% url 'plot' %}' + '?expID=' + expID + '&param1d=' + param;
+                            var url =  '{% url 'plot' %}' + '?expID=' + expID + '&param1d=' + param + '&filename=' + $('#id_file_list').val();
                             console.log(url)
                             // first delete all forms that are now out of date
             	        			divIndex = $(".single_form").index($( "#file_plot" ))
                       width: 4%;
                       align-items: center;
                     }
-                  </style>
  No newline at end of file
+                  </style>

source/madpy/djangoMad/madweb/templates/madweb/whatsNew.html +7 -7

             <!-- InstanceBeginEditable name="doctitle" -->
             <title>What's new in Madrigal 3.2?</title>
             <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
-            <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
+            <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
             <style type="text/css">
             	html body {
             		background-color: {{bg_color}};
             <body>
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>
             <!-- InstanceEndEditable -->
             <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
               <tr>
-                <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
-                <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
+                <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
                 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->What's new in Madrigal 3.0?<!-- InstanceEndEditable --></td>
                 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
                 <td width="18%"><a href="/">Madrigal home</a></td>

source/madpy/djangoMad/madweb/urls.py 0 -1

@@ -239,4 +239,3 urlpatterns = [ url(r'^$',
239	name='docs'),	239	name='docs'),
240		240
241	]	241	]
242

source/madpy/djangoMad/madweb/views.py +23 -11

                 if expDir is None:
                     raise ValueError('No expDir found for exp_id %i' % (int(expID)))
-                fileList = madWebObj.getFileFromExpID(expID, False)
+                # fileList = madWebObj.getFileFromExpID(expID, False)
-                firsttuple = [a_tuple[0] for a_tuple in fileList]
+                # firsttuple = [a_tuple[0] for a_tuple in fileList]
-                basename = firsttuple[0]
+                basename = request.GET['filename']#firsttuple[0]
                 fullFilename = os.path.join(expDir, basename)
                 with h5py.File(fullFilename, "r") as f:
                     if 'Array Layout' in data:
                         array = data['Array Layout']
-                        datatime = [datetime.datetime.fromtimestamp(t) for t in array['timestamps']]
+                        datatime = [datetime.datetime.utcfromtimestamp(t-5*60*60) for t in array['timestamps']]
-                        yrange = array['gdalt']
+                        if 'gdalt' in array:
+                            yrange = array['gdalt']
+                        elif 'range' in array:
+                            yrange = array['range']
+                        else:
+                            return HttpResponse("There is no valid data for this plot: gdalt and/or range missing")
                         if param1d==0:
-                            plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d)
+                            kindat = data['Table Layout']['kindat'][0]
+                            if kindat in (1950, 1911, 1913):
+                                plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d, array['2D Parameters']['d'+param2d][0])
+                            else:
+                                plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d)
                         else:
                             plot = plot_scatter(datatime, array['1D Parameters'][param1d], param1d)
                 return HttpResponse(plot)
-            def plot_scatter(datatime,dataparam,paramname):
+            def plot_scatter(datatime,dataparam,paramname, error=[]):
                 if (numpy.isnan(dataparam).all()):
-                    plot = "There is no valid data available for this plot"
+                    plot = "There is no valid data available for this plot: Empty array"
                 else:
+                    mode = 'markers' if len(error)>0 else 'lines'
                     fig = go.Figure()
-                    fig.add_trace(go.Scatter(x=datatime, y=dataparam))
+                    fig.add_trace(go.Scatter(x=datatime, y=dataparam, mode=mode, error_y={'type':'data', 'array':error, 'visible':True, 'color':'rgba(255, 144, 14, 0.7)'}))
                     fig.update_yaxes(title_text=paramname)
+                    fig.update_xaxes(title_text='Time [LT]')
                     delta = datatime[-1] - datatime[1]
             def plot_heatmap(datatime,datarange,dataparam,paramname):
                 if (numpy.all(numpy.isnan(dataparam))):
-                    plot = "There is no valid data available for this plot"
+                    plot = "There is no valid data available for this plot: Empty array"
                 else:
                     fig = go.Figure()
                     fig.add_trace(go.Heatmap(x=datatime,y=datarange,z= dataparam,colorscale='Jet',colorbar={"title":paramname}))
                     fig.update_yaxes(title_text="range")
+                    fig.update_xaxes(title_text="Time [LT]")
                     fig.update_layout(
                         updatemenus=[
                             dict(
                 return render(request, 'madweb/%s' % (name), {'bg_color': bg_color, 'siteSpecific': siteSpecific,
                                                                  'openmadrigal': openmadrigal})
-  No newline at end of file

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