From 7771bbd8f772ad6a1a57ffc1ecdbc0e85b24638e 2021-07-02 13:56:43
From: Juan C. Espinoza <jespinoza@igp.gob.pe>
Date: 2021-07-02 13:56:43
Subject: [PATCH] Fix bugs and plots

---

diff --git a/nginx/app.conf b/nginx/app.conf
index a3a283c..5c466f8 100644
--- a/nginx/app.conf
+++ b/nginx/app.conf
@@ -5,17 +5,17 @@ upstream djangomad {
 }
 
 server {
-    listen 80;
+    listen 8080;
 
-    location / {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
+    location /madrigal {
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
         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
+}
diff --git a/source/madpy/djangoMad/apps/updata/views.py b/source/madpy/djangoMad/apps/updata/views.py
index 239bcdd..a0a5686 100755
--- a/source/madpy/djangoMad/apps/updata/views.py
+++ b/source/madpy/djangoMad/apps/updata/views.py
@@ -12,7 +12,7 @@ import madrigal.metadata
 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
diff --git a/source/madpy/djangoMad/djangoMad/settings.py b/source/madpy/djangoMad/djangoMad/settings.py
index 992a49a..2762f09 100644
--- a/source/madpy/djangoMad/djangoMad/settings.py
+++ b/source/madpy/djangoMad/djangoMad/settings.py
@@ -22,7 +22,7 @@ SECRET_KEY = '^c1l3d35+q28^66d2pc1qlu(k$wmw^*gg3rfitz^s)t=9eu1ui'
 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'),)
 
@@ -129,10 +129,10 @@ MEDIA_URL = '/media/'
 
 # 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,
 }
diff --git a/source/madpy/djangoMad/djangoMad/urls.py b/source/madpy/djangoMad/djangoMad/urls.py
index 15c56c7..b620127 100644
--- a/source/madpy/djangoMad/djangoMad/urls.py
+++ b/source/madpy/djangoMad/djangoMad/urls.py
@@ -3,9 +3,10 @@ from django.contrib import admin
 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'^accounts/', include('apps.login.urls', namespace="login")),
-    url(r'^admin/', admin.site.urls),
+    url(r'^madrigal/updata/', include('apps.updata.urls', namespace="updata")),
+    url(r'^madrigal/accounts/', include('apps.login.urls', namespace="login")),
+    url(r'^madrigal/admin/', admin.site.urls),
+ #   url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
 ]
diff --git a/source/madpy/djangoMad/madweb/forms.py b/source/madpy/djangoMad/madweb/forms.py
index 4afdf9a..cbb99a2 100644
--- a/source/madpy/djangoMad/madweb/forms.py
+++ b/source/madpy/djangoMad/madweb/forms.py
@@ -642,6 +642,18 @@ class SingleExpPlotsForm(django.forms.Form):
 
 def check_mnemonic(s):
     
+    s.replace('vipe1', 'vipe')
+    s.replace('vipe2', 'vipe')
+    s.replace('vipn1', 'vipn')
+    s.replace('vipn2', 'vipn')
+    s.replace('vi72', 'vi7')
+    s.replace('vi82', 'vi8')
+    s.replace('dvipe1', 'dvipe')
+    s.replace('dvipe2', 'dvipe')
+    s.replace('dvipn1', 'dvipn')
+    s.replace('dvipn2', 'dvipn')
+    s.replace('dvi72', 'dvi7')
+    s.replace('dvi82', 'dvi8')
     return s.replace('+', '%2b')
 
 def get_params1(args, kwargs, madExpObj, madWebObj):
diff --git a/source/madpy/djangoMad/madweb/static/favicon.ico b/source/madpy/djangoMad/madweb/static/favicon.ico
index 8fb010d36985a181612cd9d02cbf1f40ef4063de..982149b5f7d6ea5df3c7cbd97c83532f19d72fa4 100644
GIT binary patch
literal 5064
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%0DX8AHBoLc!_B+=bXLx81e@HKtW1x8DwCMaT&T
z5*;%+4`MOjXIM0lz`V9*fR9IYxCSBY2sZ>3_-}!cBe_acjAA&YY461`T{M`dW;sE$
z3Vb$ml{9SuIterbj-|@JeP^UsuXTPxPnaMuH`TELg?;;N)lrz12|X|-`{dC&ICr?o
zr#yr(!4Q~2S%2RKucCzEInOm%1t!wcr;8Sgl_6vM3Qh1wk`bB;Bs<&Rj+s`{!~@~|
z_fbojj*?SASpU`m4ZHe)KLyMD(kHzgFd#)zQ&~3Bd;?++Vu9cJu)n~E+MJZu9ib<h
zwI_x1g(38|ZTa%lQ`SGbGWatU4FnR~NBpad33`G-ruOwD0-m%3IkwrXW8n+^`;%9K
z3OrT4Ti`D+aVB%2B)7w~=qL6Gh#_>M{Q1v^BsbT3w!&PR+d_e`c(H0I3`#RXkiN<1
z3tBEnZ6o*KO)&Ph0-3ai3VoFS-vt1Bfr+Aik4Z$*Hv3t4z}YzD*=P6o`Ll0^Wd>86
zEv%eO7{O@A^$mcpQG%Lb{3nD=?5B|bhL?kx?GadDqC@K;5_>ZeNjjJvC}bQ0{AGFb
zO>6wf&JMomw|cc|DBQynQ_kN`X;G-!tbZYq%*=R6NMP8Z+g-yVX!bX%ZHwRnAIYqf
z-W_^NbTjCLnzow_$6}BW`2Wjh$`sYG0qbou`k-Wt=iauRTSDM`)al2$nXizL5UCE*
znHUjnxZtQ?s!l)z7ns=6u0|fn?jerkZw#9wv-lEO44AhVrK2SRAbc1kW`}+7FlJ~T
zGzDp8(Jk%Fn$N&`A7w^tLf5VoSZ6xW<Y=F4-5x(JF!8B|bY@t8Nlu?{{D5!BqLv+~
zj;tG7ty%^9^BCd=_pnXKG!i<0@TV}&{M(GSZE4b44m7Lh$)O-Lfjua?^WP;oW3)J$
zfGK?IyBMUGMUtOy%@czO%>P!Ik;z>SyC|q|%qsAOn{J9go|c0WBy==RV4~>uTuEw|
zAW=7~f38w+G9}ZZYT3Tslsf`<`0P)a@uSrPq$L#=D1pLwsnY)bf`&OL^;-V+w;3U9
zLs-#xfr-nRl~Oz8VY&I19+J@NTSF~0^IDjxiCF+1)da#xpOmpJk7vx0hL5HHaxFEt
zoGolvw&q7^*P~TLkf0YF*C((CmwN7(vVr|1wRKO4N?ySOrDI2|0;i`VePpg|1MZNT
z5l3NpaaPnc1+H~fN=faza;c{EHxnbq4R5FU*v0=Vb|rM|v1{6qA8OYYmpH533K<#3
zUWM<~rj6U}bgG+xbCqtlV*x7pcbo+>r*4tFQFXs8bqC=2>q8KVxG_BXN`CanA!*%P
zH;w2u>2X&^-gj=42##2Zb)_J#MoO`0X`Qv|eP3zCmuuWLiSh2Eo6k9qOkU~wT3(Lk
ee;|Gai2NT0Rc&*qIjKDW0000<MNUMnLSTZFRJ9-g

literal 1150
zc$|%s+fN%;5XMi`N`0t6Q6Ku;NAsUFYAdx;RZ>MwYt$&MqN*inOP?Z|-lU`iP-sX<
zOdT8QY{0~3je|F~%Nk#>F}rJgTi*@7045l)VO=Q?U(XsutLCM1^xHW*GvA!it_~rm
z=sJCx(B~WEvzG~Zoe-j-&=8Fr#oI=6uf2N2zYPG{iY3WzVXd>YBxuv~JSVfRM#91&
zHf=}5G}{m!%y2RDytW*QbY{54wnnw*twT~-7RYWcuPFz^OvxW=ZAIhQD;CkLRw!lE
zvpKB$LWnYKOEj37oZF`f>lo77Ymj<2P4?FcU0V?;Sc^(%mh)(Bm;Xbh?e_|4q-^sL
z4O79q+uJ4Eo|4wiW=B0KG4*&D&0+!v>q#i<NB-~_b>CEdNydIIiqx!?_AoKk6|v)>
z5bG(#!-^*!M^=`wCJT6+$e=2RAts}+CsIhs5$wt#?5U(esEHm#j0Pn>J=4=j`gxbQ
zj7vfVkAw&;f{3?Pb}%HQaf9-ckcCSKVNq0dPCQeQoXD^yNCrK>BRQ2!fW<_>i-eyA
z8}Ohnn8wGUb^H>H;oNc=-X$mEej7^u$Jq3nu^BL<$W21hk1Cr>7F67NRGm7MUE^4D
z{f=qg0c{|Qt3DBZzExZdq>*q>qC#s*v__@)WDMf{>)7y3p=cjL!8X{YNXglTFv(eQ
z)|Z9OIfqNUgzxwevbN!NUaiYn1|Z)10rY$&Z@q!cR6jD)-?zyg@5k&@c;AzNmDS<=
zp8{?=W|2G2$)>AV)n8L;%X6ICFKN7t<iwQ|<cXvAf!RNB+2Mqf`56~E9*<^zL)zGj
z==fKNPh8{cac@s$!Kfq+Um|w@Q^a%^Uf`DbE=DQ*gKzMo)db$~Ev@}r$yf(^4mWZg
z+k%5B%nf4o?njVre}Kqn_dne3hB*2mEc!mI+&KsDy$e_z{{r%4FH@5o9lLUX?B}Jf
zTG$@Uv)2*1a~8tznHLa;--I~wE}~=SkuqHgmObNL#rZ+<TxpVRfm3^EsAozpT`TqQ
zYdT9eq>*>1=50E|dvxAU==bPtWz79d#cR~0m_G8?-p0xO-Omc-pq%ckCw$ti5X)5-
z42|NGTgbD&(*Jd{QJ5RzN^YI@+3M5Is_)^+{Vl#i$ihp6^q(UC+tgZBqiX*K#!?2V

diff --git a/source/madpy/djangoMad/madweb/templates/madweb/admin.html b/source/madpy/djangoMad/madweb/templates/madweb/admin.html
index db1c59a..1089379 100644
--- a/source/madpy/djangoMad/madweb/templates/madweb/admin.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/admin.html
@@ -7,7 +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}};
@@ -19,9 +19,9 @@
 <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' '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' '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' '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>
@@ -54,9 +54,9 @@
 <!-- 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' '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' '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' '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>
diff --git a/source/madpy/djangoMad/madweb/templates/madweb/dev_contents.html b/source/madpy/djangoMad/madweb/templates/madweb/dev_contents.html
index 4bece69..543ca71 100644
--- a/source/madpy/djangoMad/madweb/templates/madweb/dev_contents.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/dev_contents.html
@@ -7,7 +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}};
@@ -19,9 +19,9 @@
 <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' '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' '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' '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>
@@ -66,9 +66,9 @@
 <!-- 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' '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' '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' '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>
diff --git a/source/madpy/djangoMad/madweb/templates/madweb/madContents.html b/source/madpy/djangoMad/madweb/templates/madweb/madContents.html
index aa8e6fb..2c5110d 100644
--- a/source/madpy/djangoMad/madweb/templates/madweb/madContents.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/madContents.html
@@ -3,7 +3,7 @@
 <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}};
diff --git a/source/madpy/djangoMad/madweb/templates/madweb/madIntroduction.html b/source/madpy/djangoMad/madweb/templates/madweb/madIntroduction.html
index f504548..df4b03b 100644
--- a/source/madpy/djangoMad/madweb/templates/madweb/madIntroduction.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/madIntroduction.html
@@ -8,7 +8,7 @@
 <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}};
@@ -20,9 +20,9 @@
 <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="/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' '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="/madrigal/static/up.png" alt="up" 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>
@@ -42,7 +42,7 @@
 </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>
@@ -50,9 +50,9 @@
 <!-- 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="/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' '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="/madrigal/static/up.png" alt="up" 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>
diff --git a/source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html b/source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html
index a3d912c..418bab9 100755
--- a/source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/parameter_selection.html
@@ -13,7 +13,7 @@
         $('#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" ))
@@ -26,7 +26,7 @@
       $('#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" ))
@@ -47,4 +47,4 @@
           width: 4%;
           align-items: center;
         }
-      </style>
\ No newline at end of file
+      </style>
diff --git a/source/madpy/djangoMad/madweb/templates/madweb/whatsNew.html b/source/madpy/djangoMad/madweb/templates/madweb/whatsNew.html
index 14ffeee..22aa495 100644
--- a/source/madpy/djangoMad/madweb/templates/madweb/whatsNew.html
+++ b/source/madpy/djangoMad/madweb/templates/madweb/whatsNew.html
@@ -7,7 +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}};
@@ -19,9 +19,9 @@
 <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' 'madContents.html' %}"><img src="/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' '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="/madrigal/static/up.png" alt="up" 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>
@@ -342,9 +342,9 @@ Madrigal 2.2 Release - Feb 2003</h1>
 <!-- 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' 'madContents.html' %}"><img src="/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' '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="/madrigal/static/up.png" alt="up" 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>
diff --git a/source/madpy/djangoMad/madweb/urls.py b/source/madpy/djangoMad/madweb/urls.py
index 60fb647..4aef7c2 100644
--- a/source/madpy/djangoMad/madweb/urls.py
+++ b/source/madpy/djangoMad/madweb/urls.py
@@ -239,4 +239,3 @@ urlpatterns = [        url(r'^$',
                            name='docs'),
                        
                     ]
-
diff --git a/source/madpy/djangoMad/madweb/views.py b/source/madpy/djangoMad/madweb/views.py
index aba3049..74354bf 100644
--- a/source/madpy/djangoMad/madweb/views.py
+++ b/source/madpy/djangoMad/madweb/views.py
@@ -375,9 +375,9 @@ def view_plot(request):
     if expDir is None:
         raise ValueError('No expDir found for exp_id %i' % (int(expID)))
     
-    fileList = madWebObj.getFileFromExpID(expID, False)
-    firsttuple = [a_tuple[0] for a_tuple in fileList]
-    basename = firsttuple[0]
+    # fileList = madWebObj.getFileFromExpID(expID, False)
+    # firsttuple = [a_tuple[0] for a_tuple in fileList]
+    basename = request.GET['filename']#firsttuple[0]
     fullFilename = os.path.join(expDir, basename)
 
     with h5py.File(fullFilename, "r") as f:
@@ -388,11 +388,20 @@ def view_plot(request):
 
         if 'Array Layout' in data:
             array = data['Array Layout']
-            datatime = [datetime.datetime.fromtimestamp(t) for t in array['timestamps']]
-            yrange = array['gdalt']            
+            datatime = [datetime.datetime.utcfromtimestamp(t-5*60*60) for t in array['timestamps']]
+            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)
 
@@ -403,14 +412,16 @@ def view_plot(request):
 
     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]
         
@@ -451,11 +462,12 @@ def plot_scatter(datatime,dataparam,paramname):
 
 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(
@@ -3515,4 +3527,4 @@ def docs(request, name):
     return render(request, 'madweb/%s' % (name), {'bg_color': bg_color, 'siteSpecific': siteSpecific,
                                                      'openmadrigal': openmadrigal})
 
-    
\ No newline at end of file
+