##// END OF EJS Templates
DATABASES » madrigal
RSS
Fix bugs and plots
jespinoza -
r6:7771bbd8f772
parent child
Show More

The requested changes are too big and content was truncated. Show full diff

Show file before | Show file after | Hide comments
@@ -1,21 +1,21
1 # configuration
1 # configuration
2
2
3 upstream djangomad {
3 upstream djangomad {
4 server web:8000;
4 server web:8000;
5 }
5 }
6
6
7 server {
7 server {
8 listen 80;
8 listen 8080;
9
9
10 location / {
10 location /madrigal {
11 proxy_http_version 1.1;
11 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
12 proxy_set_header Upgrade $http_upgrade;
12 proxy_set_header Host $host;
13 proxy_set_header Connection "upgrade";
14 proxy_redirect off;
13 proxy_redirect off;
14 proxy_set_header X-Script-Name /madrigal;
15 proxy_pass http://djangomad;
15 proxy_pass http://djangomad;
16 }
16 }
17
17
18 location /static/ {
18 location /madrigal/static/ {
19 alias /static/;
19 alias /static/;
20 }
20 }
21 }
21 }
Show file before | Show file after | Hide comments
@@ -1,83 +1,83
1
1
2 from django.contrib.auth.decorators import login_required
2 from django.contrib.auth.decorators import login_required
3 from django.shortcuts import render
3 from django.shortcuts import render
4 from .forms import UpdataForm, ExpForm
4 from .forms import UpdataForm, ExpForm
5 from django.core.files.storage import FileSystemStorage
5 from django.core.files.storage import FileSystemStorage
6 from django.contrib import messages
6 from django.contrib import messages
7
7
8 import os
8 import os
9
9
10 # madrigal imports
10 # madrigal imports
11 import madrigal.metadata
11 import madrigal.metadata
12 import madrigal.ui.web
12 import madrigal.ui.web
13 import madrigal.admin
13 import madrigal.admin
14
14
15 @login_required
15 @login_required(login_url='/madrigal/accounts/login/')
16 def index(request):
16 def index(request):
17 '''
17 '''
18 Uploading experiments data view. Allows user to upload experiment files
18 Uploading experiments data view. Allows user to upload experiment files
19
19
20 '''
20 '''
21 dbAdminObj = madrigal.admin.MadrigalDBAdmin()
21 dbAdminObj = madrigal.admin.MadrigalDBAdmin()
22 madDB = madrigal.metadata.MadrigalDB()
22 madDB = madrigal.metadata.MadrigalDB()
23 madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
23 madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
24 siteName, siteList = madWebObj.getSiteInfo()
24 siteName, siteList = madWebObj.getSiteInfo()
25
25
26 if request.method == 'POST':
26 if request.method == 'POST':
27 form = UpdataForm(request.POST, request.FILES)
27 form = UpdataForm(request.POST, request.FILES)
28 files = request.FILES.getlist('file')
28 files = request.FILES.getlist('file')
29
29
30 if form.is_valid():
30 if form.is_valid():
31 try:
31 try:
32 description = form.cleaned_data['description']
32 description = form.cleaned_data['description']
33 instCode = int(form.cleaned_data['instruments'])
33 instCode = int(form.cleaned_data['instruments'])
34 expId = form.cleaned_data['experiments']
34 expId = form.cleaned_data['experiments']
35 perm = int(form.cleaned_data['type'])
35 perm = int(form.cleaned_data['type'])
36
36
37 #saving file
37 #saving file
38 for f in files:
38 for f in files:
39 fs = FileSystemStorage(location='/tmp')
39 fs = FileSystemStorage(location='/tmp')
40 fs.save(f.name, f)
40 fs.save(f.name, f)
41 madExp = madrigal.metadata.MadrigalExperiment()
41 madExp = madrigal.metadata.MadrigalExperiment()
42 filepath = os.path.join('/tmp', f.name)
42 filepath = os.path.join('/tmp', f.name)
43 expTitle = madExp.getExpNameByExpId(expId)
43 expTitle = madExp.getExpNameByExpId(expId)
44
44
45 dbAdminObj.createMadrigalExperiment(filepath,expTitle, perm, description, instCode)
45 dbAdminObj.createMadrigalExperiment(filepath,expTitle, perm, description, instCode)
46
46
47
47
48 madInstParams = madrigal.metadata.MadrigalInstrumentParameters()
48 madInstParams = madrigal.metadata.MadrigalInstrumentParameters()
49 madInstKindats = madrigal.metadata.MadrigalInstrumentKindats()
49 madInstKindats = madrigal.metadata.MadrigalInstrumentKindats()
50
50
51 print('*** Updating local metadata ***')
51 print('*** Updating local metadata ***')
52 dbAdminObj.__updateLocalMetadata__()
52 dbAdminObj.__updateLocalMetadata__()
53 print('*** Rebuilding instParmTab.txt ***')
53 print('*** Rebuilding instParmTab.txt ***')
54 madInstParams.rebuildInstParmTable()
54 madInstParams.rebuildInstParmTable()
55 print('*** Rebuilding instKindatTab.txt ***')
55 print('*** Rebuilding instKindatTab.txt ***')
56 madInstKindats.rebuildInstKindatTable()
56 madInstKindats.rebuildInstKindatTable()
57 messages.success(
57 messages.success(
58 request, 'Experimento(s) creado(s) exitosamente')
58 request, 'Experimento(s) creado(s) exitosamente')
59 form = UpdataForm()
59 form = UpdataForm()
60
60
61 except Exception as e:
61 except Exception as e:
62 messages.error(
62 messages.error(
63 request, str(e))
63 request, str(e))
64 else:
64 else:
65 form = UpdataForm()
65 form = UpdataForm()
66
66
67 return render(request, 'updata/index.html', {
67 return render(request, 'updata/index.html', {
68 'form': form,
68 'form': form,
69 'site_name': siteName,
69 'site_name': siteName,
70 'site_list': siteList,
70 'site_list': siteList,
71 })
71 })
72
72
73
73
74 def get_experiments(request):
74 def get_experiments(request):
75 """get_experiments is a Ajax call that returns the experiments select html to support the
75 """get_experiments is a Ajax call that returns the experiments select html to support the
76 updata UI. Called when a user modifies the intruments select field.
76 updata UI. Called when a user modifies the intruments select field.
77
77
78 Inputs:
78 Inputs:
79 request
79 request
80 """
80 """
81 form = ExpForm(request.GET)
81 form = ExpForm(request.GET)
82
82
83 return render(request, 'updata/experiments.html', {'form': form})
83 return render(request, 'updata/experiments.html', {'form': form})
Show file before | Show file after | Hide comments
@@ -1,138 +1,138
1 """
1 """
2 Django settings for djangoMad project.
2 Django settings for djangoMad project.
3
3
4 For more information on this file, see
4 For more information on this file, see
5 https://docs.djangoproject.com/en/1.7/topics/settings/
5 https://docs.djangoproject.com/en/1.7/topics/settings/
6
6
7 For the full list of settings and their values, see
7 For the full list of settings and their values, see
8 https://docs.djangoproject.com/en/1.7/ref/settings/
8 https://docs.djangoproject.com/en/1.7/ref/settings/
9 """
9 """
10
10
11 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
11 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
12 import os
12 import os
13 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
13 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
14
14
15 # Quick-start development settings - unsuitable for production
15 # Quick-start development settings - unsuitable for production
16 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
16 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
17
17
18 # SECURITY WARNING: keep the secret key used in production secret!
18 # SECURITY WARNING: keep the secret key used in production secret!
19 SECRET_KEY = '^c1l3d35+q28^66d2pc1qlu(k$wmw^*gg3rfitz^s)t=9eu1ui'
19 SECRET_KEY = '^c1l3d35+q28^66d2pc1qlu(k$wmw^*gg3rfitz^s)t=9eu1ui'
20
20
21 # SECURITY WARNING: don't run with debug turned on in production!
21 # SECURITY WARNING: don't run with debug turned on in production!
22 DEBUG = True
22 DEBUG = True
23
23
24
24
25 ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost']
25 ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost', '10.10.120.60']
26
26
27 ADMINS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
27 ADMINS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
28
28
29 EMAIL_HOST = 'hyperion.haystack.mit.edu'
29 EMAIL_HOST = 'hyperion.haystack.mit.edu'
30
30
31 SEND_BROKEN_LINK_EMAILS = True
31 SEND_BROKEN_LINK_EMAILS = True
32
32
33 MANAGERS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
33 MANAGERS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
34
34
35
35
36 # Application definition
36 # Application definition
37
37
38 INSTALLED_APPS = (
38 INSTALLED_APPS = (
39 'django.contrib.admin',
39 'django.contrib.admin',
40 'django.contrib.auth',
40 'django.contrib.auth',
41 'django.contrib.contenttypes',
41 'django.contrib.contenttypes',
42 'django.contrib.sessions',
42 'django.contrib.sessions',
43 'django.contrib.messages',
43 'django.contrib.messages',
44 'django.contrib.staticfiles',
44 'django.contrib.staticfiles',
45 'madweb',
45 'madweb',
46 'django_bootstrap_calendar',
46 'django_bootstrap_calendar',
47 'bootstrap3',
47 'bootstrap3',
48 'apps.login',
48 'apps.login',
49 'apps.updata',
49 'apps.updata',
50 )
50 )
51
51
52 MIDDLEWARE = [
52 MIDDLEWARE = [
53 'django.middleware.security.SecurityMiddleware',
53 'django.middleware.security.SecurityMiddleware',
54 'django.contrib.sessions.middleware.SessionMiddleware',
54 'django.contrib.sessions.middleware.SessionMiddleware',
55 'django.middleware.common.CommonMiddleware',
55 'django.middleware.common.CommonMiddleware',
56 'django.middleware.csrf.CsrfViewMiddleware',
56 'django.middleware.csrf.CsrfViewMiddleware',
57 'django.contrib.auth.middleware.AuthenticationMiddleware',
57 'django.contrib.auth.middleware.AuthenticationMiddleware',
58 'django.contrib.messages.middleware.MessageMiddleware',
58 'django.contrib.messages.middleware.MessageMiddleware',
59 'django.middleware.clickjacking.XFrameOptionsMiddleware',
59 'django.middleware.clickjacking.XFrameOptionsMiddleware',
60 ]
60 ]
61
61
62 ROOT_URLCONF = 'djangoMad.urls'
62 ROOT_URLCONF = 'djangoMad.urls'
63
63
64 WSGI_APPLICATION = 'djangoMad.wsgi.application'
64 WSGI_APPLICATION = 'djangoMad.wsgi.application'
65
65
66
66
67 TEMPLATES = [
67 TEMPLATES = [
68 {
68 {
69 'BACKEND': 'django.template.backends.django.DjangoTemplates',
69 'BACKEND': 'django.template.backends.django.DjangoTemplates',
70 'DIRS': [
70 'DIRS': [
71 os.path.join(BASE_DIR, "templates"),
71 os.path.join(BASE_DIR, "templates"),
72 ],
72 ],
73 'APP_DIRS': True,
73 'APP_DIRS': True,
74 'OPTIONS': {
74 'OPTIONS': {
75 'context_processors': [
75 'context_processors': [
76 'django.contrib.auth.context_processors.auth',
76 'django.contrib.auth.context_processors.auth',
77 'django.template.context_processors.debug',
77 'django.template.context_processors.debug',
78 'django.template.context_processors.i18n',
78 'django.template.context_processors.i18n',
79 'django.template.context_processors.media',
79 'django.template.context_processors.media',
80 'django.template.context_processors.static',
80 'django.template.context_processors.static',
81 'django.template.context_processors.tz',
81 'django.template.context_processors.tz',
82 'django.contrib.messages.context_processors.messages',
82 'django.contrib.messages.context_processors.messages',
83 'django.template.context_processors.request',
83 'django.template.context_processors.request',
84 ],
84 ],
85 },
85 },
86 },
86 },
87 ]
87 ]
88
88
89
89
90 # Database
90 # Database
91 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
91 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
92
92
93 DATABASES = {
93 DATABASES = {
94 'default': {
94 'default': {
95 'ENGINE': 'django.db.backends.sqlite3',
95 'ENGINE': 'django.db.backends.sqlite3',
96 'NAME': 'madrigal.sqlite',
96 'NAME': 'madrigal.sqlite',
97 }
97 }
98 }
98 }
99
99
100
100
101 # Internationalization
101 # Internationalization
102 # https://docs.djangoproject.com/en/1.7/topics/i18n/
102 # https://docs.djangoproject.com/en/1.7/topics/i18n/
103
103
104 LANGUAGE_CODE = 'en-us'
104 LANGUAGE_CODE = 'en-us'
105
105
106 TIME_ZONE = 'UTC'
106 TIME_ZONE = 'UTC'
107
107
108 USE_I18N = True
108 USE_I18N = True
109
109
110 USE_L10N = True
110 USE_L10N = True
111
111
112 USE_TZ = True
112 USE_TZ = True
113
113
114
114
115 # Absolute filesystem path to the directory that will hold user-uploaded files.
115 # Absolute filesystem path to the directory that will hold user-uploaded files.
116 # Example: "/home/media/media.lawrence.com/media/"
116 # Example: "/home/media/media.lawrence.com/media/"
117 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
117 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
118
118
119 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
119 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
120 # trailing slash.
120 # trailing slash.
121 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
121 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
122 MEDIA_URL = '/media/'
122 MEDIA_URL = '/media/'
123
123
124 # Absolute path to the directory static files should be collected to.
124 # Absolute path to the directory static files should be collected to.
125 # Don't put anything in this directory yourself; store your static files
125 # Don't put anything in this directory yourself; store your static files
126 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
126 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
127 # Example: "/home/media/media.lawrence.com/static/"
127 # Example: "/home/media/media.lawrence.com/static/"
128 # STATIC_ROOT = os.path.join(BASE_DIR, 'static')
128 # STATIC_ROOT = os.path.join(BASE_DIR, 'static')
129
129
130 # URL prefix for static files.
130 # URL prefix for static files.
131 # Example: "http://media.lawrence.com/static/"
131 # Example: "http://media.lawrence.com/static/"
132 STATIC_URL = '/static/'
132 STATIC_URL = '/madrigal/static/'
133
133
134 BOOTSTRAP3 = {
134 BOOTSTRAP3 = {
135 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
135 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
136 'jquery_url': '/static/jquery.min.js',
136 'jquery_url': '/madrigal/static/jquery.min.js',
137 'include_jquery': True,
137 'include_jquery': True,
138 }
138 }
Show file before | Show file after | Hide comments
@@ -1,11 +1,12
1 from django.conf.urls import include, url
1 from django.conf.urls import include, url
2 from django.contrib import admin
2 from django.contrib import admin
3 import madweb.views
3 import madweb.views
4
4
5 urlpatterns = [
5 urlpatterns = [
6 url(r'^', include('madweb.urls')),
6 url(r'^madrigal/', include('madweb.urls')),
7 url(r'^$', madweb.views.index),
7 url(r'^$', madweb.views.index),
8 url(r'^updata/', include('apps.updata.urls', namespace="updata")),
8 url(r'^madrigal/updata/', include('apps.updata.urls', namespace="updata")),
9 url(r'^accounts/', include('apps.login.urls', namespace="login")),
9 url(r'^madrigal/accounts/', include('apps.login.urls', namespace="login")),
10 url(r'^admin/', admin.site.urls),
10 url(r'^madrigal/admin/', admin.site.urls),
11 # url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
11 ]
12 ]
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -1,75 +1,75
1 {% load static %}
1 {% load static %}
2
2
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
5 <head>
5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
7 <!-- InstanceBeginEditable name="doctitle" -->
7 <!-- InstanceBeginEditable name="doctitle" -->
8 <title>Madrigal administrator's guide</title>
8 <title>Madrigal administrator's guide</title>
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
10 <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
10 <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
11 <style type="text/css">
11 <style type="text/css">
12 html body {
12 html body {
13 background-color: {{bg_color}};
13 background-color: {{bg_color}};
14 }
14 }
15 </style>
15 </style>
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_back_top" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_prev_top" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="ad_appropriate.html" -->
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_back_top" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_prev_top" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="ad_appropriate.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="rr_fortran95.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="ad_appropriate.html" -->
17 </head>
17 </head>
18
18
19 <body>
19 <body>
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
21 <tr>
21 <tr>
22 <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
22 <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
28 </tr>
28 </tr>
29 </table>
29 </table>
30 <div class='online-navigation'>
30 <div class='online-navigation'>
31 <b class="navlabel">Previous:</b>
31 <b class="navlabel">Previous:</b>
32 <a class="sectref" href="{% url 'docs' 'rr_fortran95.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Fortran95 remote API reference <!-- InstanceEndEditable --></A>
32 <a class="sectref" href="{% url 'docs' 'rr_fortran95.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Fortran95 remote API reference <!-- InstanceEndEditable --></A>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
36 <a class="sectref" href="{% url 'docs' 'ad_appropriate.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Is Madrigal appropriate?<!-- InstanceEndEditable --></A></div>
36 <a class="sectref" href="{% url 'docs' 'ad_appropriate.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Is Madrigal appropriate?<!-- InstanceEndEditable --></A></div>
37 <hr/>
37 <hr/>
38 <!-- InstanceBeginEditable name="EditDoc" -->
38 <!-- InstanceBeginEditable name="EditDoc" -->
39 <h1 align="center">Madrigal administrator's guide</h1>
39 <h1 align="center">Madrigal administrator's guide</h1>
40 <p>This section of the Madrigal documentation is meant for people considering installing Madrigal to hold data from their instruments, or those who have already installed Madrigal and are responsible for administering or updating it. This guide describes how to determine whether Madrigal is right for your data, and how to install it if it is. It also discusses how to create Madrigal data files, and how to add them to Madrigal. </p>
40 <p>This section of the Madrigal documentation is meant for people considering installing Madrigal to hold data from their instruments, or those who have already installed Madrigal and are responsible for administering or updating it. This guide describes how to determine whether Madrigal is right for your data, and how to install it if it is. It also discusses how to create Madrigal data files, and how to add them to Madrigal. </p>
41 <ul>
41 <ul>
42 <li><a href="{% url 'docs' 'ad_appropriate.html' %}">Is Madrigal appropriate for my instrument(s)?</a></li>
42 <li><a href="{% url 'docs' 'ad_appropriate.html' %}">Is Madrigal appropriate for my instrument(s)?</a></li>
43 <li><a href="{% url 'docs' 'ad_install.html' %}">Installing Madrigal for the first time </a></li>
43 <li><a href="{% url 'docs' 'ad_install.html' %}">Installing Madrigal for the first time </a></li>
44 <li><a href="{% url 'docs' 'ad_upgrade.html' %}">Upgrading Madrigal to the latest release</a></li>
44 <li><a href="{% url 'docs' 'ad_upgrade.html' %}">Upgrading Madrigal to the latest release</a></li>
45 <li><a href="{% url 'docs' 'ad_metadata.html' %}">The Madrigal data model and metadata files</a></li>
45 <li><a href="{% url 'docs' 'ad_metadata.html' %}">The Madrigal data model and metadata files</a></li>
46 <li><a href="{% url 'docs' 'ad_experiments.html' %}">How Madrigal data is organized</a></li>
46 <li><a href="{% url 'docs' 'ad_experiments.html' %}">How Madrigal data is organized</a></li>
47 <li><a href="{% url 'docs' 'ad_createFiles.html' %}">Creating Madrigal data files</a></li>
47 <li><a href="{% url 'docs' 'ad_createFiles.html' %}">Creating Madrigal data files</a></li>
48 <li><a href="{% url 'docs' 'ad_createExp.html' %}">Creating and updating Madrigal experiments</a></li>
48 <li><a href="{% url 'docs' 'ad_createExp.html' %}">Creating and updating Madrigal experiments</a></li>
49 <li><a href="{% url 'docs' 'ad_other.html' %}">Other administrative tasks</a></li>
49 <li><a href="{% url 'docs' 'ad_other.html' %}">Other administrative tasks</a></li>
50 <li><a href="{% url 'docs' 'ad_logging.html' %}">User access logging</a></li>
50 <li><a href="{% url 'docs' 'ad_logging.html' %}">User access logging</a></li>
51 <li><a href="{% url 'docs' 'ad_links.html' %}">Creating direct links to experiments/files</a></li>
51 <li><a href="{% url 'docs' 'ad_links.html' %}">Creating direct links to experiments/files</a></li>
52 <li><a href="{% url 'docs' 'ad_isprint.html' %}">Using isprint for file quick looks</a></li>
52 <li><a href="{% url 'docs' 'ad_isprint.html' %}">Using isprint for file quick looks</a></li>
53 </ul>
53 </ul>
54 <!-- InstanceEndEditable -->
54 <!-- InstanceEndEditable -->
55 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
55 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
56 <tr>
56 <tr>
57 <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
57 <td width="5%"><a href="{% url 'docs' 'rr_fortran95.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
58 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
58 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
59 <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
59 <td width="5%"><a href="{% url 'docs' 'ad_appropriate.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
60 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
60 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal administrator's guide<!-- InstanceEndEditable --></td>
61 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
61 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
62 <td width="18%"><a href="/">Madrigal home</a></td>
62 <td width="18%"><a href="/">Madrigal home</a></td>
63 </tr>
63 </tr>
64 </table>
64 </table>
65 <div class='online-navigation'>
65 <div class='online-navigation'>
66 <b class="navlabel">Previous:</b>
66 <b class="navlabel">Previous:</b>
67 <a class="sectref" href="{% url 'docs' 'rr_fortran95.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Fortran95 remote API reference <!-- InstanceEndEditable --></A>
67 <a class="sectref" href="{% url 'docs' 'rr_fortran95.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Fortran95 remote API reference <!-- InstanceEndEditable --></A>
68 <b class="navlabel">&nbsp;&nbsp;Up:</b>
68 <b class="navlabel">&nbsp;&nbsp;Up:</b>
69 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
69 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
70 <b class="navlabel">&nbsp;&nbsp;Next:</b>
70 <b class="navlabel">&nbsp;&nbsp;Next:</b>
71 <a class="sectref" href="{% url 'docs' 'ad_appropriate.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Is Madrigal appropriate? <!-- InstanceEndEditable --></A></div>
71 <a class="sectref" href="{% url 'docs' 'ad_appropriate.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Is Madrigal appropriate? <!-- InstanceEndEditable --></A></div>
72 <hr/>
72 <hr/>
73 <p>&nbsp;</p>
73 <p>&nbsp;</p>
74 </body>
74 </body>
75 <!-- InstanceEnd --></html>
75 <!-- InstanceEnd --></html>
Show file before | Show file after | Hide comments
@@ -1,87 +1,87
1 {% load static %}
1 {% load static %}
2
2
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
5 <head>
5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
7 <!-- InstanceBeginEditable name="doctitle" -->
7 <!-- InstanceBeginEditable name="doctitle" -->
8 <title>Madrigal developer's guide</title>
8 <title>Madrigal developer's guide</title>
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
10 <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
10 <link href="{% static 'madrigal.css' %}" rel="stylesheet" type="text/css" />
11 <style type="text/css">
11 <style type="text/css">
12 html body {
12 html body {
13 background-color: {{bg_color}};
13 background-color: {{bg_color}};
14 }
14 }
15 </style>
15 </style>
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_back_top" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_prev_top" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="madrigal/index.html" -->
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_back_top" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_prev_top" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="madrigal/index.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="ad_isprint.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="madrigal/index.html" -->
17 </head>
17 </head>
18
18
19 <body>
19 <body>
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
21 <tr>
21 <tr>
22 <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
22 <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal developer's guide <!-- InstanceEndEditable --></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal developer's guide <!-- InstanceEndEditable --></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
28 </tr>
28 </tr>
29 </table>
29 </table>
30 <div class='online-navigation'>
30 <div class='online-navigation'>
31 <b class="navlabel">Previous:</b>
31 <b class="navlabel">Previous:</b>
32 <a class="sectref" href="{% url 'docs' 'ad_isprint.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Using isprint<!-- InstanceEndEditable --></A>
32 <a class="sectref" href="{% url 'docs' 'ad_isprint.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Using isprint<!-- InstanceEndEditable --></A>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
36 <a class="sectref" href="{% url 'docs' 'madrigal/index.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Internal python API<!-- InstanceEndEditable --></A></div>
36 <a class="sectref" href="{% url 'docs' 'madrigal/index.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Internal python API<!-- InstanceEndEditable --></A></div>
37 <hr/>
37 <hr/>
38 <!-- InstanceBeginEditable name="EditDoc" -->
38 <!-- InstanceBeginEditable name="EditDoc" -->
39 <h1 align="center">Madrigal developer's guide</h1>
39 <h1 align="center">Madrigal developer's guide</h1>
40 <p>This section of the Madrigal documentation is meant for developers working to extend or modify Madrigal. It is not meant for users of Madrigal or Madrigal administrators. </p>
40 <p>This section of the Madrigal documentation is meant for developers working to extend or modify Madrigal. It is not meant for users of Madrigal or Madrigal administrators. </p>
41 <p>With the release of Madrigal 3.0, Madrigal has only a single python API. The C and Fortran code installed in Madrigal is purely scientific code used in the derivation engine, and is exposed only as a python extension, madrigal._derive.</p>
41 <p>With the release of Madrigal 3.0, Madrigal has only a single python API. The C and Fortran code installed in Madrigal is purely scientific code used in the derivation engine, and is exposed only as a python extension, madrigal._derive.</p>
42 <p>The web interface is now a Django web application, and no direct cgi scripts remain. The django application is contained in MADROOT/source/madpy/djangoMad.</p>
42 <p>The web interface is now a Django web application, and no direct cgi scripts remain. The django application is contained in MADROOT/source/madpy/djangoMad.</p>
43 <ul>
43 <ul>
44 <li><a href="madrigal/index.html">Internal Madrigal Python API</a>
44 <li><a href="madrigal/index.html">Internal Madrigal Python API</a>
45 <ul>
45 <ul>
46 <li><a href="{% url 'docs' 'madrigal/admin.m.html' %}">madrigal.admin</a></li>
46 <li><a href="{% url 'docs' 'madrigal/admin.m.html' %}">madrigal.admin</a></li>
47 <li><a href="{% url 'docs' 'madrigal/cedar.m.html' %}">madrigal.cedar</a></li>
47 <li><a href="{% url 'docs' 'madrigal/cedar.m.html' %}">madrigal.cedar</a></li>
48 <li><a href="{% url 'docs' 'madrigal/data.m.html' %}">madrigal.data</a></li>
48 <li><a href="{% url 'docs' 'madrigal/data.m.html' %}">madrigal.data</a></li>
49 <li><a href="{% url 'docs' 'madrigal/derivation.m.html' %}">madrigal.derivation</a></li>
49 <li><a href="{% url 'docs' 'madrigal/derivation.m.html' %}">madrigal.derivation</a></li>
50 <li><a href="{% url 'docs' 'madrigal/isprint.m.html' %}">madrigal.isprint</a></li>
50 <li><a href="{% url 'docs' 'madrigal/isprint.m.html' %}">madrigal.isprint</a></li>
51 <li><a href="{% url 'docs' 'madrigal/metadata.m.html' %}">madrigal.metadata</a></li>
51 <li><a href="{% url 'docs' 'madrigal/metadata.m.html' %}">madrigal.metadata</a></li>
52 <li><a href="{% url 'docs' 'madrigal/openmadrigal.m.html' %}">madrigal.openmadrigal</a></li>
52 <li><a href="{% url 'docs' 'madrigal/openmadrigal.m.html' %}">madrigal.openmadrigal</a></li>
53 <li><a href="{% url 'docs' 'madrigal/ui/index.html' %}">madrigal.ui</a>
53 <li><a href="{% url 'docs' 'madrigal/ui/index.html' %}">madrigal.ui</a>
54 <ul>
54 <ul>
55 <li><a href="{% url 'docs' 'madrigal/ui/madrigalPlot.m.html' %}">madrigal.ui.madrigalPlot</a></li>
55 <li><a href="{% url 'docs' 'madrigal/ui/madrigalPlot.m.html' %}">madrigal.ui.madrigalPlot</a></li>
56 <li><a href="{% url 'docs' 'madrigal/ui/userData.m.html' %}">madrigal.ui.userData</a></li>
56 <li><a href="{% url 'docs' 'madrigal/ui/userData.m.html' %}">madrigal.ui.userData</a></li>
57 <li><a href="{% url 'docs' 'madrigal/ui/web.m.html' %}">madrigal.ui.web</a></li>
57 <li><a href="{% url 'docs' 'madrigal/ui/web.m.html' %}">madrigal.ui.web</a></li>
58 </ul>
58 </ul>
59 </li>
59 </li>
60 </ul>
60 </ul>
61 </li>
61 </li>
62 <li><a href="{% url 'docs' 'dev_derivation.html' %}">Madrigal derivation engine</a></li>
62 <li><a href="{% url 'docs' 'dev_derivation.html' %}">Madrigal derivation engine</a></li>
63 <li><a href="/static/CEDARMadrigalHdf5Format.pdf">CEDAR Madrigal Hdf5 file format</a></li>
63 <li><a href="/static/CEDARMadrigalHdf5Format.pdf">CEDAR Madrigal Hdf5 file format</a></li>
64 <li><a href="/static/cedarFormat.pdf">Deprecated Cedar file format</a></li>
64 <li><a href="/static/cedarFormat.pdf">Deprecated Cedar file format</a></li>
65 </ul>
65 </ul>
66 <!-- InstanceEndEditable -->
66 <!-- InstanceEndEditable -->
67 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
67 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
68 <tr>
68 <tr>
69 <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
69 <td width="5%"><a href="{% url 'docs' 'ad_isprint.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td>
70 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
70 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td>
71 <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
71 <td width="5%"><a href="{% url 'docs' 'madrigal/index.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td>
72 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal developer's guide<!-- InstanceEndEditable --></td>
72 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal developer's guide<!-- InstanceEndEditable --></td>
73 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
73 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
74 <td width="18%"><a href="/">Madrigal home</a></td>
74 <td width="18%"><a href="/">Madrigal home</a></td>
75 </tr>
75 </tr>
76 </table>
76 </table>
77 <div class='online-navigation'>
77 <div class='online-navigation'>
78 <b class="navlabel">Previous:</b>
78 <b class="navlabel">Previous:</b>
79 <a class="sectref" href="{% url 'docs' 'ad_isprint.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Using isprint <!-- InstanceEndEditable --></A>
79 <a class="sectref" href="{% url 'docs' 'ad_isprint.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Using isprint <!-- InstanceEndEditable --></A>
80 <b class="navlabel">&nbsp;&nbsp;Up:</b>
80 <b class="navlabel">&nbsp;&nbsp;Up:</b>
81 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
81 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
82 <b class="navlabel">&nbsp;&nbsp;Next:</b>
82 <b class="navlabel">&nbsp;&nbsp;Next:</b>
83 <a class="sectref" href="{% url 'docs' 'madrigal/index.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Internal python API <!-- InstanceEndEditable --></A></div>
83 <a class="sectref" href="{% url 'docs' 'madrigal/index.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Internal python API <!-- InstanceEndEditable --></A></div>
84 <hr/>
84 <hr/>
85 <p>&nbsp;</p>
85 <p>&nbsp;</p>
86 </body>
86 </body>
87 <!-- InstanceEnd --></html>
87 <!-- InstanceEnd --></html>
Show file before | Show file after | Hide comments
@@ -1,50 +1,50
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 <html xmlns="http://www.w3.org/1999/xhtml">
2 <html xmlns="http://www.w3.org/1999/xhtml">
3 <head>
3 <head>
4 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
4 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5 <title>Madrigal documentation - v3.0</title>
5 <title>Madrigal documentation - v3.0</title>
6 <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
6 <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
7 <style type="text/css">
7 <style type="text/css">
8 html body {
8 html body {
9 background-color: {{bg_color}};
9 background-color: {{bg_color}};
10 }
10 }
11 </style>
11 </style>
12 </head>
12 </head>
13
13
14 <body>
14 <body>
15 <center>
15 <center>
16 <h1>Madrigal Database v3.2.1 Documentation - Contents</h1>
16 <h1>Madrigal Database v3.2.1 Documentation - Contents</h1>
17 <table width="100%" border="1">
17 <table width="100%" border="1">
18 <tr>
18 <tr>
19 <td class="navigation"><a href="/">Home</a></td>
19 <td class="navigation"><a href="/">Home</a></td>
20 </tr>
20 </tr>
21 </table>
21 </table>
22 </center>
22 </center>
23 <hr size="4" />
23 <hr size="4" />
24 <ul>
24 <ul>
25 <li><a href="{% url 'docs' 'madIntroduction.html' %}">1. Brief history of Madrigal</a></li>
25 <li><a href="{% url 'docs' 'madIntroduction.html' %}">1. Brief history of Madrigal</a></li>
26 </ul>
26 </ul>
27 <ul>
27 <ul>
28 <li><a href="{% url 'docs' 'whatsNew.html' %}">2. What's new in Madrigal 3.2.1</a></li>
28 <li><a href="{% url 'docs' 'whatsNew.html' %}">2. What's new in Madrigal 3.2.1</a></li>
29 </ul>
29 </ul>
30 <ul>
30 <ul>
31 <li><a href="{% url 'docs' 'wt_usersGuide.html' %}">3. Madrigal user's guide (How do I access Madrigal data?) </a>
31 <li><a href="{% url 'docs' 'wt_usersGuide.html' %}">3. Madrigal user's guide (How do I access Madrigal data?) </a>
32 <ul>
32 <ul>
33 <li><a href="{% url 'docs' 'wt_contents.html' %}">2.1 Web interface tutorial </a></li>
33 <li><a href="{% url 'docs' 'wt_contents.html' %}">2.1 Web interface tutorial </a></li>
34 <li><a href="{% url 'docs' 'rt_contents.html' %}">2.2 Remote data access programming tutorial</a></li>
34 <li><a href="{% url 'docs' 'rt_contents.html' %}">2.2 Remote data access programming tutorial</a></li>
35 <li><a href="{% url 'docs' 'rr_contents.html' %}">2.3 Remote data access programming reference guide</a></li>
35 <li><a href="{% url 'docs' 'rr_contents.html' %}">2.3 Remote data access programming reference guide</a></li>
36 </ul>
36 </ul>
37 </li>
37 </li>
38 </ul>
38 </ul>
39 <ul>
39 <ul>
40 <li><a href="{% url 'docs' 'admin.html' %}">4. Madrigal Administrator's Guide</a></li>
40 <li><a href="{% url 'docs' 'admin.html' %}">4. Madrigal Administrator's Guide</a></li>
41 </ul>
41 </ul>
42 <ul>
42 <ul>
43 <li><a href="{% url 'docs' 'dev_contents.html' %}">5. Madrigal Developer's Guide</a></li>
43 <li><a href="{% url 'docs' 'dev_contents.html' %}">5. Madrigal Developer's Guide</a></li>
44 </ul>
44 </ul>
45 <ul>
45 <ul>
46 <li><a href="{{ siteSpecific }}">6. Site specific documentation</a></li>
46 <li><a href="{{ siteSpecific }}">6. Site specific documentation</a></li>
47 </ul>
47 </ul>
48 <p>&nbsp;</p>
48 <p>&nbsp;</p>
49 </body>
49 </body>
50 </html>
50 </html>
Show file before | Show file after | Hide comments
@@ -1,71 +1,71
1 {% load static %}
1 {% load static %}
2
2
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
5 <head>
5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
7 <!-- InstanceBeginEditable name="doctitle" -->
7 <!-- InstanceBeginEditable name="doctitle" -->
8 <title>Madrigal history</title>
8 <title>Madrigal history</title>
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
10 <!-- InstanceEndEditable -->
10 <!-- InstanceEndEditable -->
11 <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
11 <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
12 <style type="text/css">
12 <style type="text/css">
13 html body {
13 html body {
14 background-color: {{bg_color}};
14 background-color: {{bg_color}};
15 }
15 }
16 </style>
16 </style>
17 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_back_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_prev_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="whatsNew.html" -->
17 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_back_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_prev_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="whatsNew.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="whatsNew.html" -->
18 </head>
18 </head>
19
19
20 <body>
20 <body>
21 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
21 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
22 <tr>
22 <tr>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
25 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
25 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
26 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Brief history of Madrigal <!-- InstanceEndEditable --></td>
26 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Brief history of Madrigal <!-- InstanceEndEditable --></td>
27 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
27 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
28 <td width="18%"><a href="/">Madrigal home</a></td>
28 <td width="18%"><a href="/">Madrigal home</a></td>
29 </tr>
29 </tr>
30 </table>
30 </table>
31 <div class='online-navigation'>
31 <div class='online-navigation'>
32 <b class="navlabel">Previous:</b>
32 <b class="navlabel">Previous:</b>
33 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Doc home <!-- InstanceEndEditable --></A>
33 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Doc home <!-- InstanceEndEditable --></A>
34 <b class="navlabel">&nbsp;&nbsp;Up:</b>
34 <b class="navlabel">&nbsp;&nbsp;Up:</b>
35 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
35 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
36 <b class="navlabel">&nbsp;&nbsp;Next:</b>
36 <b class="navlabel">&nbsp;&nbsp;Next:</b>
37 <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></A></div>
37 <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></A></div>
38 <hr/>
38 <hr/>
39 <!-- InstanceBeginEditable name="EditDoc" -->
39 <!-- InstanceBeginEditable name="EditDoc" -->
40 <center>
40 <center>
41 <h1>Brief history of Madrigal </h1>
41 <h1>Brief history of Madrigal </h1>
42 </center>
42 </center>
43 <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>
43 <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>
44 <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>
44 <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>
45 <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>
45 <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>
46 <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>
46 <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>
47 <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>
47 <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>
48 <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>
48 <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>
49 <p>Madrigal is an open source project with a central <a href="http://cedar.openmadrigal.org/openmadrigal">developer's web site</a> and a <a href="http://atlas.haystack.mit.edu/cgi-bin/millstone_viewvc.cgi/openmadrigal/" target="_self">central repository</a>. A complete Subversion archive of all Madrigal software, including software which is not included with the standard distribution, is available at the developer's web site. There is also an Open Madrigal mailing list and developer's forum. Any group wishing to install Madrigal to distribute their instrument's data is welcome to - see the http://cedar.openmadrigal.org/openmadrigal web site for details. The <a href="http://atlas.haystack.mit.edu/cgi-bin/millstone_viewvc.cgi/openmadrigal/" target="_self">central repository</a> link is a place where all data from all Madrigal sites is archived. It can also be used to access data, although accessing the local sites is preferred.</p>
49 <p>Madrigal is an open source project with a central <a href="http://cedar.openmadrigal.org/openmadrigal">developer's web site</a> and a <a href="http://atlas.haystack.mit.edu/cgi-bin/millstone_viewvc.cgi/openmadrigal/" target="_self">central repository</a>. A complete Subversion archive of all Madrigal software, including software which is not included with the standard distribution, is available at the developer's web site. There is also an Open Madrigal mailing list and developer's forum. Any group wishing to install Madrigal to distribute their instrument's data is welcome to - see the http://cedar.openmadrigal.org/openmadrigal web site for details. The <a href="http://atlas.haystack.mit.edu/cgi-bin/millstone_viewvc.cgi/openmadrigal/" target="_self">central repository</a> link is a place where all data from all Madrigal sites is archived. It can also be used to access data, although accessing the local sites is preferred.</p>
50 <!-- InstanceEndEditable -->
50 <!-- InstanceEndEditable -->
51 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
51 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
52 <tr>
52 <tr>
53 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
53 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
54 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
54 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
55 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
55 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
56 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Brief overview of Madrigal <!-- InstanceEndEditable --></td>
56 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Brief overview of Madrigal <!-- InstanceEndEditable --></td>
57 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
57 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
58 <td width="18%"><a href="/">Madrigal home</a></td>
58 <td width="18%"><a href="/">Madrigal home</a></td>
59 </tr>
59 </tr>
60 </table>
60 </table>
61 <div class='online-navigation'>
61 <div class='online-navigation'>
62 <b class="navlabel">Previous:</b>
62 <b class="navlabel">Previous:</b>
63 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Doc Home <!-- InstanceEndEditable --></A>
63 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Doc Home <!-- InstanceEndEditable --></A>
64 <b class="navlabel">&nbsp;&nbsp;Up:</b>
64 <b class="navlabel">&nbsp;&nbsp;Up:</b>
65 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
65 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
66 <b class="navlabel">&nbsp;&nbsp;Next:</b>
66 <b class="navlabel">&nbsp;&nbsp;Next:</b>
67 <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></A></div>
67 <a class="sectref" href="{% url 'docs' 'whatsNew.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></A></div>
68 <hr/>
68 <hr/>
69 <p>&nbsp;</p>
69 <p>&nbsp;</p>
70 </body>
70 </body>
71 <!-- InstanceEnd --></html>
71 <!-- InstanceEnd --></html>
Show file before | Show file after | Hide comments
@@ -1,50 +1,50
1 <div class="row" style="margin-bottom: 20px">
1 <div class="row" style="margin-bottom: 20px">
2 Select parameter: <br>
2 Select parameter: <br>
3 {{ form.param_list1d.label }}
3 {{ form.param_list1d.label }}
4 {{ form.param_list1d }}
4 {{ form.param_list1d }}
5 {% if form.param_list2d %}
5 {% if form.param_list2d %}
6 {{ form.param_list2d.label }}
6 {{ form.param_list2d.label }}
7 {{ form.param_list2d }}
7 {{ form.param_list2d }}
8 {% endif %}
8 {% endif %}
9
9
10 </div>
10 </div>
11
11
12 <script>
12 <script>
13 $('#id_param_list2d').bind('change', function (e) {
13 $('#id_param_list2d').bind('change', function (e) {
14 var expID = '{{ expID }}';
14 var expID = '{{ expID }}';
15 var param = $(this).val();
15 var param = $(this).val();
16 var url = '{% url 'plot' %}' + '?expID=' + expID + '&param2d=' + param;
16 var url = '{% url 'plot' %}' + '?expID=' + expID + '&param2d=' + param + '&filename=' + $('#id_file_list').val();
17 console.log(url)
17 console.log(url)
18 // first delete all forms that are now out of date
18 // first delete all forms that are now out of date
19 divIndex = $(".single_form").index($( "#file_plot" ))
19 divIndex = $(".single_form").index($( "#file_plot" ))
20 $(".single_form").slice(divIndex).empty()
20 $(".single_form").slice(divIndex).empty()
21 // second populate the file_plot html if '0' not selected
21 // second populate the file_plot html if '0' not selected
22 if (param != '0') {
22 if (param != '0') {
23 $(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class=\"load_center\"/>").load(url);
23 $(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class=\"load_center\"/>").load(url);
24 }
24 }
25 })
25 })
26 $('#id_param_list1d').bind('change', function (e) {
26 $('#id_param_list1d').bind('change', function (e) {
27 var expID = '{{ expID }}';
27 var expID = '{{ expID }}';
28 var param = $(this).val();
28 var param = $(this).val();
29 var url = '{% url 'plot' %}' + '?expID=' + expID + '&param1d=' + param;
29 var url = '{% url 'plot' %}' + '?expID=' + expID + '&param1d=' + param + '&filename=' + $('#id_file_list').val();
30 console.log(url)
30 console.log(url)
31 // first delete all forms that are now out of date
31 // first delete all forms that are now out of date
32 divIndex = $(".single_form").index($( "#file_plot" ))
32 divIndex = $(".single_form").index($( "#file_plot" ))
33 $(".single_form").slice(divIndex).empty()
33 $(".single_form").slice(divIndex).empty()
34 // second populate the file_plot html if '0' not selected
34 // second populate the file_plot html if '0' not selected
35 if (param != '0') {
35 if (param != '0') {
36 $(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class =\"load_center\"/>").load(url);
36 $(".single_form").slice(divIndex,divIndex+1).html("<img src=\"static/loader.gif\" class =\"load_center\"/>").load(url);
37 }
37 }
38 })
38 })
39 </script>
39 </script>
40 <style>
40 <style>
41 .load_center {
41 .load_center {
42 display: block;
42 display: block;
43 margin-left: auto;
43 margin-left: auto;
44 margin-right: auto;
44 margin-right: auto;
45 margin-top: 100px;
45 margin-top: 100px;
46 margin-bottom: 100px;
46 margin-bottom: 100px;
47 width: 4%;
47 width: 4%;
48 align-items: center;
48 align-items: center;
49 }
49 }
50 </style>
50 </style>
Show file before | Show file after | Hide comments
@@ -1,363 +1,363
1 {% load static %}
1 {% load static %}
2
2
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
4 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/doc_template.dwt" codeOutsideHTMLIsLocked="false" -->
5 <head>
5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
7 <!-- InstanceBeginEditable name="doctitle" -->
7 <!-- InstanceBeginEditable name="doctitle" -->
8 <title>What's new in Madrigal 3.2?</title>
8 <title>What's new in Madrigal 3.2?</title>
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
9 <!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" --><!-- InstanceEndEditable -->
10 <link href="/static/madrigal.css" rel="stylesheet" type="text/css" />
10 <link href="/madrigal/static/madrigal.css" rel="stylesheet" type="text/css" />
11 <style type="text/css">
11 <style type="text/css">
12 html body {
12 html body {
13 background-color: {{bg_color}};
13 background-color: {{bg_color}};
14 }
14 }
15 </style>
15 </style>
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_back_top" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_prev_top" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="wt_usersGuide.html" -->
16 <!-- InstanceParam name="href_up_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_top" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_back_top" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_back_bottom" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_up_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_next_bottom" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_prev_top" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_uptitle_top" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_top" type="text" value="wt_usersGuide.html" --><!-- InstanceParam name="href_prevtitle_bottom" type="text" value="madIntroduction.html" --><!-- InstanceParam name="href_uptitle_bottom" type="text" value="madContents.html" --><!-- InstanceParam name="href_nexttitle_bottom" type="text" value="wt_usersGuide.html" -->
17 </head>
17 </head>
18
18
19 <body>
19 <body>
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
21 <tr>
21 <tr>
22 <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
22 <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
23 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
24 <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->What's new in Madrigal 3.0? <!-- InstanceEndEditable --></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
28 </tr>
28 </tr>
29 </table>
29 </table>
30 <div class='online-navigation'>
30 <div class='online-navigation'>
31 <b class="navlabel">Previous:</b>
31 <b class="navlabel">Previous:</b>
32 <a class="sectref" href="{% url 'docs' 'madIntroduction.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Brief History <!-- InstanceEndEditable --></A>
32 <a class="sectref" href="{% url 'docs' 'madIntroduction.html' %}"><!-- InstanceBeginEditable name="PreviousTitle" -->Brief History <!-- InstanceEndEditable --></A>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
33 <b class="navlabel">&nbsp;&nbsp;Up:</b>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
34 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle" -->Doc home <!-- InstanceEndEditable --></A>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
35 <b class="navlabel">&nbsp;&nbsp;Next:</b>
36 <a class="sectref" href="{% url 'docs' 'wt_usersGuide.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Madrigal user's guide <!-- InstanceEndEditable --></A></div>
36 <a class="sectref" href="{% url 'docs' 'wt_usersGuide.html' %}"><!-- InstanceBeginEditable name="NextTitle" -->Madrigal user's guide <!-- InstanceEndEditable --></A></div>
37 <hr/>
37 <hr/>
38 <!-- InstanceBeginEditable name="EditDoc" -->
38 <!-- InstanceBeginEditable name="EditDoc" -->
39
39
40 <h1 align="center">What's new in Madrigal 3.2.2?</h1>
40 <h1 align="center">What's new in Madrigal 3.2.2?</h1>
41 <h1 align="center" style="text-align: left">Madrigal 3.2.2 Release - Jan 2021</h1>
41 <h1 align="center" style="text-align: left">Madrigal 3.2.2 Release - Jan 2021</h1>
42 <p align="center" style="text-align: left">Fixed bug in linking to external data using the Select Single Experiment user interface. </p>
42 <p align="center" style="text-align: left">Fixed bug in linking to external data using the Select Single Experiment user interface. </p>
43
43
44
44
45 <h1 align="center">What's new in Madrigal 3.2.1?</h1>
45 <h1 align="center">What's new in Madrigal 3.2.1?</h1>
46 <h1 align="center" style="text-align: left">Madrigal 3.2.1 Release - Nov 2020</h1>
46 <h1 align="center" style="text-align: left">Madrigal 3.2.1 Release - Nov 2020</h1>
47 <h2 align="center" style="text-align: left">Allows Madrigal to create citations to groups of files</h2>
47 <h2 align="center" style="text-align: left">Allows Madrigal to create citations to groups of files</h2>
48 <p align="center" style="text-align: left">With Madrigal 3.2.1, users can use the API to create citations to groups of files, and can display those groups with that citation. </p>
48 <p align="center" style="text-align: left">With Madrigal 3.2.1, users can use the API to create citations to groups of files, and can display those groups with that citation. </p>
49
49
50
50
51 <h1 align="center">What's new in Madrigal 3.1.1?</h1>
51 <h1 align="center">What's new in Madrigal 3.1.1?</h1>
52 <h1 align="center" style="text-align: left">Madrigal 3.1.1 Release - Nov 2019</h1>
52 <h1 align="center" style="text-align: left">Madrigal 3.1.1 Release - Nov 2019</h1>
53 <h2 align="center" style="text-align: left">Allows Madrigal to run using https</h2>
53 <h2 align="center" style="text-align: left">Allows Madrigal to run using https</h2>
54 <p align="center" style="text-align: left">With Madrigal 3.1.1, the code is compatable with https. Instructions are given to install or convert Madrigal to https. </p>
54 <p align="center" style="text-align: left">With Madrigal 3.1.1, the code is compatable with https. Instructions are given to install or convert Madrigal to https. </p>
55
55
56 <h1 align="center">What's new in Madrigal 3.1?</h1>
56 <h1 align="center">What's new in Madrigal 3.1?</h1>
57 <h1 align="center" style="text-align: left">Madrigal 3.1 Release - Oct 2019</h1>
57 <h1 align="center" style="text-align: left">Madrigal 3.1 Release - Oct 2019</h1>
58 <h2 align="center" style="text-align: left">Conversion to Python 3</h2>
58 <h2 align="center" style="text-align: left">Conversion to Python 3</h2>
59 <p align="center" style="text-align: left">With Madrigal 3.1, all python code has been updated to use python 3 instead of python 2. The functionality is unchanged from Madrigal 3.0.</p>
59 <p align="center" style="text-align: left">With Madrigal 3.1, all python code has been updated to use python 3 instead of python 2. The functionality is unchanged from Madrigal 3.0.</p>
60
60
61 <h1 align="center" style="text-align: left">Madrigal 3.0 Release - Sept 2017</h1>
61 <h1 align="center" style="text-align: left">Madrigal 3.0 Release - Sept 2017</h1>
62 <blockquote>
62 <blockquote>
63 <h2 align="center" style="text-align: left">Migration to Hdf5 file format</h2>
63 <h2 align="center" style="text-align: left">Migration to Hdf5 file format</h2>
64 <p align="center" style="text-align: left">With Madrigal 3.0, the old 16 bit integer based file format has been replaced with Hdf5. However, all the data model and well-defined parameters have been retained. The CEDAR Hdf5 format is designed to be completely self-contained. That is, any user with an Hdf5 reader can fully understand all data in the file without any reference to documentation. A full description of the format can be found <a href="/static/CEDARMadrigalHdf5Format.pdf">here</a>.</p>
64 <p align="center" style="text-align: left">With Madrigal 3.0, the old 16 bit integer based file format has been replaced with Hdf5. However, all the data model and well-defined parameters have been retained. The CEDAR Hdf5 format is designed to be completely self-contained. That is, any user with an Hdf5 reader can fully understand all data in the file without any reference to documentation. A full description of the format can be found <a href="/static/CEDARMadrigalHdf5Format.pdf">here</a>.</p>
65 <h2 align="center" style="text-align: left">Web interface generates scripts to download any amount of data</h2>
65 <h2 align="center" style="text-align: left">Web interface generates scripts to download any amount of data</h2>
66 <p align="center" style="text-align: left">With Madrigal 3, you can generate a script command to download a whole series of files with a few click. You can also create a script that will filter those same files and allow you to choose the parameters you want, again with just a few clicks. These scripts can be run with python, Matlab, or IDL.</p>
66 <p align="center" style="text-align: left">With Madrigal 3, you can generate a script command to download a whole series of files with a few click. You can also create a script that will filter those same files and allow you to choose the parameters you want, again with just a few clicks. These scripts can be run with python, Matlab, or IDL.</p>
67 <h2 align="center" style="text-align: left">Download files in a new format</h2>
67 <h2 align="center" style="text-align: left">Download files in a new format</h2>
68 <p align="center" style="text-align: left">Prior to Madrigal 3, files could be downloaded only as ascii or Hdf5 (or the difficult to understand CEDAR format). Now they can be downloaded as ascii, Hdf5, or netCDF4.</p>
68 <p align="center" style="text-align: left">Prior to Madrigal 3, files could be downloaded only as ascii or Hdf5 (or the difficult to understand CEDAR format). Now they can be downloaded as ascii, Hdf5, or netCDF4.</p>
69 <h2 align="center" style="text-align: left">Get data with selected/derived parameters and filters in new formats</h2>
69 <h2 align="center" style="text-align: left">Get data with selected/derived parameters and filters in new formats</h2>
70 <p align="center" style="text-align: left">Prior to Madrigal 3, data with selected/derived parameters and filters was available
70 <p align="center" style="text-align: left">Prior to Madrigal 3, data with selected/derived parameters and filters was available
71 only as ascii. Now it can be downloaded as ascii, Hdf5, or netCDF4.</p>
71 only as ascii. Now it can be downloaded as ascii, Hdf5, or netCDF4.</p>
72 <h2 align="center" style="text-align: left">Independent spatial parameters now built in to data model</h2>
72 <h2 align="center" style="text-align: left">Independent spatial parameters now built in to data model</h2>
73 <p align="center" style="text-align: left">Prior to Madrigal 3.0, there was no way to automatically tell what the independent spatial parameters were in vector data. With Madrigal 3.0, any data with vector data must define its independent spatial parameters, which can be found in the Hdf5 Metadata group. This allows Madrigal to automatically add array layouts of the data, making for easier plotting.</p>
73 <p align="center" style="text-align: left">Prior to Madrigal 3.0, there was no way to automatically tell what the independent spatial parameters were in vector data. With Madrigal 3.0, any data with vector data must define its independent spatial parameters, which can be found in the Hdf5 Metadata group. This allows Madrigal to automatically add array layouts of the data, making for easier plotting.</p>
74 <h2 align="center" style="text-align: left">All new web interface</h2>
74 <h2 align="center" style="text-align: left">All new web interface</h2>
75 <p align="center" style="text-align: left">A much simplified web interface based on Django and bootstrap. Developed with much assistance from Jicamarca Observatory and Jose Antonio Sal y Rosas Celi.</p>
75 <p align="center" style="text-align: left">A much simplified web interface based on Django and bootstrap. Developed with much assistance from Jicamarca Observatory and Jose Antonio Sal y Rosas Celi.</p>
76 <h2 align="center" style="text-align: left">Simple FTP-like web interface added</h2>
76 <h2 align="center" style="text-align: left">Simple FTP-like web interface added</h2>
77 <p align="center" style="text-align: left">Designed for non-native English speakers. The url follows a very simple pattern that can be easily parsed if the user in unable to understand the Madrigal API's and automatically generated scripts.</p>
77 <p align="center" style="text-align: left">Designed for non-native English speakers. The url follows a very simple pattern that can be easily parsed if the user in unable to understand the Madrigal API's and automatically generated scripts.</p>
78 <h2 align="center" style="text-align: left">Create CEDAR Hdf5 files with either Matlab or python</h2>
78 <h2 align="center" style="text-align: left">Create CEDAR Hdf5 files with either Matlab or python</h2>
79 <p align="center" style="text-align: left">Prior to Madrigal 3, there was only a python API to easily create Madrigal files. Now both Matlab and python can be used to create CEDAR Hdf5 files.</p>
79 <p align="center" style="text-align: left">Prior to Madrigal 3, there was only a python API to easily create Madrigal files. Now both Matlab and python can be used to create CEDAR Hdf5 files.</p>
80 <h2 align="center" style="text-align: left">All metadata easily accessible</h2>
80 <h2 align="center" style="text-align: left">All metadata easily accessible</h2>
81 <p align="center" style="text-align: left">The <em>Access metadata</em> menu item on the main navigation menu allows easy access to all Madrigal CEDAR metadata, including Madrigal sites, instruments, parameter definitions, and kind of data codes.</p>
81 <p align="center" style="text-align: left">The <em>Access metadata</em> menu item on the main navigation menu allows easy access to all Madrigal CEDAR metadata, including Madrigal sites, instruments, parameter definitions, and kind of data codes.</p>
82 </blockquote>
82 </blockquote>
83 <h1>Madrigal 2.6.3.2 Release - March 22, 2012</h1>
83 <h1>Madrigal 2.6.3.2 Release - March 22, 2012</h1>
84 <p>Added support to file download cgi scripts to allow logging of remote API requests to download files.</p>
84 <p>Added support to file download cgi scripts to allow logging of remote API requests to download files.</p>
85 <h1>Madrigal 2.6.3.1 Release - March 13, 2012</h1>
85 <h1>Madrigal 2.6.3.1 Release - March 13, 2012</h1>
86 <p>Added popup javascript window to warn users not to click &quot;Download File&quot; button multiple times.</p>
86 <p>Added popup javascript window to warn users not to click &quot;Download File&quot; button multiple times.</p>
87 <h1>Madrigal 2.6.3 Release - Febuary 27, 2012</h1>
87 <h1>Madrigal 2.6.3 Release - Febuary 27, 2012</h1>
88 <p>Small bug fixes in 3 cgi scripts affecting plots: madExperiment.cgi, madDataDisplay, getMadplot.py</p>
88 <p>Small bug fixes in 3 cgi scripts affecting plots: madExperiment.cgi, madDataDisplay, getMadplot.py</p>
89 <h1>Madrigal 2.6.2 Release - Febuary 8, 2012</h1>
89 <h1>Madrigal 2.6.2 Release - Febuary 8, 2012</h1>
90 <p>Small bug fix involving creating Hdf5 export files in data.py.</p>
90 <p>Small bug fix involving creating Hdf5 export files in data.py.</p>
91 <h1>Madrigal 2.6.1 Release - January 20, 2012</h1>
91 <h1>Madrigal 2.6.1 Release - January 20, 2012</h1>
92 <p>Small bug fix involving a memory leak in _Madrec.c and a rare problem creating Hdf5 export files in data.py. </p>
92 <p>Small bug fix involving a memory leak in _Madrec.c and a rare problem creating Hdf5 export files in data.py. </p>
93 <h1>Madrigal 2.6 Release - November 2011 </h1>
93 <h1>Madrigal 2.6 Release - November 2011 </h1>
94 <blockquote>
94 <blockquote>
95 <h2>New simple local web user interface </h2>
95 <h2>New simple local web user interface </h2>
96 <p>A new easy to use interface to access local Madrigal data was developed by Jicamarca with support from Millstone Hill staff. This interface in now very robust and has been tested with data from all Madrigal sites.</p>
96 <p>A new easy to use interface to access local Madrigal data was developed by Jicamarca with support from Millstone Hill staff. This interface in now very robust and has been tested with data from all Madrigal sites.</p>
97 <h2>HDF5 file download availablity</h2>
97 <h2>HDF5 file download availablity</h2>
98 <p>Users can now download data files as HDF5, in addition to simple column delimited ascii and the more complex <a href="/static/cedarFormat.pdf" target="_self">CEDAR formats</a>. This is also the result of a Jicamarca/Millstone Hill collaborations.</p>
98 <p>Users can now download data files as HDF5, in addition to simple column delimited ascii and the more complex <a href="/static/cedarFormat.pdf" target="_self">CEDAR formats</a>. This is also the result of a Jicamarca/Millstone Hill collaborations.</p>
99 <h2>Users can register interest in experiments or instruments</h2>
99 <h2>Users can register interest in experiments or instruments</h2>
100 <p>Users can now register interest in experiments or instruments, and get emails whenever that Madrigal experiment or instrument is updated.</p>
100 <p>Users can now register interest in experiments or instruments, and get emails whenever that Madrigal experiment or instrument is updated.</p>
101 <h2>Administrative improvements - can now add external disks to experiments</h2>
101 <h2>Administrative improvements - can now add external disks to experiments</h2>
102 <p>It is now easy to expand the Madrigal database by <a href="ad_other.html#experiments" target="_self">mounting additional hard disks</a> to make more room for data.</p>
102 <p>It is now easy to expand the Madrigal database by <a href="ad_other.html#experiments" target="_self">mounting additional hard disks</a> to make more room for data.</p>
103 <h2>New metadata - experiment PI's and analyst</h2>
103 <h2>New metadata - experiment PI's and analyst</h2>
104 <p>Experiments now have direct email links to the experiment PI. These PI's can be updated on an experiment or intrument basis.</p>
104 <p>Experiments now have direct email links to the experiment PI. These PI's can be updated on an experiment or intrument basis.</p>
105 <h2>Global seach now more robust</h2>
105 <h2>Global seach now more robust</h2>
106 <p>The global search UI now generates scripts so you can run the global search right from your computer using either the <a href="rt_python.html" target="_self">python remote API</a>, the <a href="rt_matlab.html" target="_self">Matlab remote API</a>, or the<a href="rt_idl.html" target="_self"> IDL remote API</a>.</p>
106 <p>The global search UI now generates scripts so you can run the global search right from your computer using either the <a href="rt_python.html" target="_self">python remote API</a>, the <a href="rt_matlab.html" target="_self">Matlab remote API</a>, or the<a href="rt_idl.html" target="_self"> IDL remote API</a>.</p>
107 <p>&nbsp;</p>
107 <p>&nbsp;</p>
108 </blockquote>
108 </blockquote>
109 <hr />
109 <hr />
110 <p>&nbsp;</p>
110 <p>&nbsp;</p>
111 <h1>Madrigal 2.5.2 Release - May 2009</h1>
111 <h1>Madrigal 2.5.2 Release - May 2009</h1>
112 <blockquote>
112 <blockquote>
113 <p>A bug fix release - no new features. </p>
113 <p>A bug fix release - no new features. </p>
114 </blockquote>
114 </blockquote>
115 <h1>Madrigal 2.5.1 Release - March 2009</h1>
115 <h1>Madrigal 2.5.1 Release - March 2009</h1>
116 <blockquote>
116 <blockquote>
117 <p>This minor revision to Madrigal 2.5 was needed to support using Madrigal as an archiving database. The experiment metadata was expanded to allow archived experiments. Archived experiments are not shared between Madrigal sites, but are visible as local experiments. </p>
117 <p>This minor revision to Madrigal 2.5 was needed to support using Madrigal as an archiving database. The experiment metadata was expanded to allow archived experiments. Archived experiments are not shared between Madrigal sites, but are visible as local experiments. </p>
118 </blockquote>
118 </blockquote>
119 <h1>Madrigal 2.5 Release - February 2009 </h1>
119 <h1>Madrigal 2.5 Release - February 2009 </h1>
120 <blockquote>
120 <blockquote>
121 <h2>Simplification of Web User Interface </h2>
121 <h2>Simplification of Web User Interface </h2>
122 <p>Both the Browse for Individual Madrigal Experiments and the Global Madrigal Database Report web interface have been simplified. Searching for instruments under Browse for Individual Madrigal Experiments is now easier through the use of an instrument category selector.</p>
122 <p>Both the Browse for Individual Madrigal Experiments and the Global Madrigal Database Report web interface have been simplified. Searching for instruments under Browse for Individual Madrigal Experiments is now easier through the use of an instrument category selector.</p>
123 <h2>One step file printing available</h2>
123 <h2>One step file printing available</h2>
124 <p>Under Browse for Individual Madrigal Experiments, users can now choose to print an ascii version of any Madrigal file with one click. With this option they can not include any derived parameters or data filters.</p>
124 <p>Under Browse for Individual Madrigal Experiments, users can now choose to print an ascii version of any Madrigal file with one click. With this option they can not include any derived parameters or data filters.</p>
125 <h2>Installation simplified </h2>
125 <h2>Installation simplified </h2>
126 <p>Autotools is now used to compile all code, significantly reducing the number of parameters in the madrigal.cfg configuration file.</p>
126 <p>Autotools is now used to compile all code, significantly reducing the number of parameters in the madrigal.cfg configuration file.</p>
127 <h2>64-bit tested </h2>
127 <h2>64-bit tested </h2>
128 <p>Madrigal has now been fully tested as a 64-bit application. It is important that all Madrigal installations switch to 64-bit machines by the year 2037, because 32-bit unix cannot handle dates beyond then.</p>
128 <p>Madrigal has now been fully tested as a 64-bit application. It is important that all Madrigal installations switch to 64-bit machines by the year 2037, because 32-bit unix cannot handle dates beyond then.</p>
129 <h2>International Reference Ionosphere (IRI) derived parameters now available</h2>
129 <h2>International Reference Ionosphere (IRI) derived parameters now available</h2>
130 <p>All parameters calculated by the International Reference Ionosphere (IRI) model can now be selected as derived parameters.</p>
130 <p>All parameters calculated by the International Reference Ionosphere (IRI) model can now be selected as derived parameters.</p>
131 <h2>Additional automatic sharing of metadata added</h2>
131 <h2>Additional automatic sharing of metadata added</h2>
132 <p>For administrators: Now when new sites or instruments are added to Madrigal, these metadata files are automatically added to your site. </p>
132 <p>For administrators: Now when new sites or instruments are added to Madrigal, these metadata files are automatically added to your site. </p>
133 <h2>Experiment level security</h2>
133 <h2>Experiment level security</h2>
134 <p>Previously, individual Madrigal files could be made public or private. Now entire experiments can be made public, private, or hidden altogether. See the script <a href="ad_createExp.html#changeExpStatus">changeExpStatus.py</a> for details. </p>
134 <p>Previously, individual Madrigal files could be made public or private. Now entire experiments can be made public, private, or hidden altogether. See the script <a href="ad_createExp.html#changeExpStatus">changeExpStatus.py</a> for details. </p>
135 <h2>Experiment directory naming convention modified </h2>
135 <h2>Experiment directory naming convention modified </h2>
136 <p>Previous to Madrigal 2.5, all Madrigal experiments had to be stored in directory paths in the form:</p>
136 <p>Previous to Madrigal 2.5, all Madrigal experiments had to be stored in directory paths in the form:</p>
137 <pre>$MADROOT/experiments/YYYY/&lt;3 letter inst mnemonic&gt;/ddMMMyy[letter],
137 <pre>$MADROOT/experiments/YYYY/&lt;3 letter inst mnemonic&gt;/ddMMMyy[letter],
138 Example: /opt/madrigal/experiments/1998/mlh/20jan98b.</pre>
138 Example: /opt/madrigal/experiments/1998/mlh/20jan98b.</pre>
139 <p>Under this convention, the date of the directory name represented the start date of the experiment, with one letter optionally added. This meant there was a limited number of experiments that could be created for a particular day for a particular experiment. This part of the directory naming convention has been dropped, and now the convention is:</p>
139 <p>Under this convention, the date of the directory name represented the start date of the experiment, with one letter optionally added. This meant there was a limited number of experiments that could be created for a particular day for a particular experiment. This part of the directory naming convention has been dropped, and now the convention is:</p>
140 <pre>$MADROOT/experiments/YYYY/&lt;3 letter inst mnemonic&gt;/*,
140 <pre>$MADROOT/experiments/YYYY/&lt;3 letter inst mnemonic&gt;/*,
141 Example: /opt/madrigal/experiments/1998/mlh/mlh_exp_234.
141 Example: /opt/madrigal/experiments/1998/mlh/mlh_exp_234.
142 </pre>
142 </pre>
143 </blockquote>
143 </blockquote>
144
144
145 <hr />
145 <hr />
146 <h1>Madrigal 2.4 Release - February 2006 </h1>
146 <h1>Madrigal 2.4 Release - February 2006 </h1>
147 <blockquote>
147 <blockquote>
148 <h2>Simple web UI added</h2>
148 <h2>Simple web UI added</h2>
149 <p>A new web user-interface has been added that allows easy printing and plotting of basic Madrigal data. To make it easy to use, advanced Madrigal features such as derived parameters and filtering of data have been removed.</p>
149 <p>A new web user-interface has been added that allows easy printing and plotting of basic Madrigal data. To make it easy to use, advanced Madrigal features such as derived parameters and filtering of data have been removed.</p>
150 <h2>On-demand plot creation</h2>
150 <h2>On-demand plot creation</h2>
151 <p>Madrigal now allows users to create basic scatter plots and pcolor plots versus range or altitude of any measured or derived parameter in a data set.</p>
151 <p>Madrigal now allows users to create basic scatter plots and pcolor plots versus range or altitude of any measured or derived parameter in a data set.</p>
152 <h2>Logging of user data access</h2>
152 <h2>Logging of user data access</h2>
153 <p>Madrigal now <a href="ad_logging.html">logs user's names, emails, and affiliations</a> whenever data files are directly accessed in a file administrators can access. </p>
153 <p>Madrigal now <a href="ad_logging.html">logs user's names, emails, and affiliations</a> whenever data files are directly accessed in a file administrators can access. </p>
154 <h2>Automatic updating of all geophysical data</h2>
154 <h2>Automatic updating of all geophysical data</h2>
155 <p>Madrigal now automatically updates all its internal geophysical files (e.g., Kp, Fof2, Dst, Imf, etc) every time updateMaster is run. </p>
155 <p>Madrigal now automatically updates all its internal geophysical files (e.g., Kp, Fof2, Dst, Imf, etc) every time updateMaster is run. </p>
156 <h2>Simple-to-use python module to create and edit Madrigal files</h2>
156 <h2>Simple-to-use python module to create and edit Madrigal files</h2>
157 <p>There is now a <a href="ad_createFiles.html#python">simple-to-use python module</a> to create and edit Madrigal files. </p>
157 <p>There is now a <a href="ad_createFiles.html#python">simple-to-use python module</a> to create and edit Madrigal files. </p>
158 <h2>New administrative scripts to manage Madrigal experiments</h2>
158 <h2>New administrative scripts to manage Madrigal experiments</h2>
159 <p>Administrators can now add or modify all Madrigal experiments using <a href="ad_createExp.html">simple administrative scripts</a>, instead of trying to edit Madrigal metadata files themselves or use the complex genExp script. </p>
159 <p>Administrators can now add or modify all Madrigal experiments using <a href="ad_createExp.html">simple administrative scripts</a>, instead of trying to edit Madrigal metadata files themselves or use the complex genExp script. </p>
160 <h2>Complete documentation rewrite</h2>
160 <h2>Complete documentation rewrite</h2>
161 <p>Madrigal documentation has now been completely rewritten and reorganized into three manuals: one for <a href="wt_usersGuide.html">users</a>, one for <a href="admin.html">administrators</a>, and one for <a href="dev_contents.html">developers</a>. </p>
161 <p>Madrigal documentation has now been completely rewritten and reorganized into three manuals: one for <a href="wt_usersGuide.html">users</a>, one for <a href="admin.html">administrators</a>, and one for <a href="dev_contents.html">developers</a>. </p>
162 <h2>Automatic graphics conversion</h2>
162 <h2>Automatic graphics conversion</h2>
163 <p>Madrigal will now allow users to select any graphics format they prefer for <a href="ad_createExp.html#auxillary">graphics administrators place in experiments</a>. This feature was contributed by Eiscat. </p>
163 <p>Madrigal will now allow users to select any graphics format they prefer for <a href="ad_createExp.html#auxillary">graphics administrators place in experiments</a>. This feature was contributed by Eiscat. </p>
164 <h2>Update of IGRF/MSIS</h2>
164 <h2>Update of IGRF/MSIS</h2>
165 <p>The Madrigal derivation engine is now using the <a href="http://www.ngdc.noaa.gov/IAGA/vmod/igrf.html">IGRF 2010 coefficients</a>, and the <a href="https://omniweb.gsfc.nasa.gov/vitmo/msis_vitmo.html">MSIS 2000 model</a>. </p>
165 <p>The Madrigal derivation engine is now using the <a href="http://www.ngdc.noaa.gov/IAGA/vmod/igrf.html">IGRF 2010 coefficients</a>, and the <a href="https://omniweb.gsfc.nasa.gov/vitmo/msis_vitmo.html">MSIS 2000 model</a>. </p>
166 <h2>Limiting of disk space used for global search files</h2>
166 <h2>Limiting of disk space used for global search files</h2>
167 <p>Administrators can now limit the maximum amount of disk space used to store temporary global search files. See the section on editing the madrigal.cfg file in the installation guide. </p>
167 <p>Administrators can now limit the maximum amount of disk space used to store temporary global search files. See the section on editing the madrigal.cfg file in the installation guide. </p>
168 </blockquote>
168 </blockquote>
169 <p>&nbsp;</p>
169 <p>&nbsp;</p>
170 <hr />
170 <hr />
171 <p>&nbsp;</p>
171 <p>&nbsp;</p>
172 <h1>Madrigal 2.3 Release - March 2004</h1>
172 <h1>Madrigal 2.3 Release - March 2004</h1>
173
173
174 <blockquote>
174 <blockquote>
175 <h2>Remote programming access to Madrigal via web services using any platform</h2>
175 <h2>Remote programming access to Madrigal via web services using any platform</h2>
176 <p>Madrigal now exposes all the information and capabilities it has as web services, which allows
176 <p>Madrigal now exposes all the information and capabilities it has as web services, which allows
177 easy access to Madrigal from any computer on the internet using any platform (Unix, Windows, Mac, etc).
177 easy access to Madrigal from any computer on the internet using any platform (Unix, Windows, Mac, etc).
178 Madrigal's web services are basically cgi scripts with simple output that allows easy parsing of the
178 Madrigal's web services are basically cgi scripts with simple output that allows easy parsing of the
179 information. Any language that supports the HTTP standard can then access any Madrigal site. We have
179 information. Any language that supports the HTTP standard can then access any Madrigal site. We have
180 written remote API's using python and Matlab, but almost any language could be used. See the section
180 written remote API's using python and Matlab, but almost any language could be used. See the section
181 on <a href="{% url 'docs' 'rt_contents.html' %}">remote programming access</a> for details of these APIs and the underlying web services.</p>
181 on <a href="{% url 'docs' 'rt_contents.html' %}">remote programming access</a> for details of these APIs and the underlying web services.</p>
182 <p>Note that this approach of remotely accessing Madrigal data has been always possible before by parsing the
182 <p>Note that this approach of remotely accessing Madrigal data has been always possible before by parsing the
183 html output meant to be displayed in a web browser (this general programming method is referred to as "screen
183 html output meant to be displayed in a web browser (this general programming method is referred to as "screen
184 scraping"). However, not only is this parsing difficult; but the code often breaks when the user interface
184 scraping"). However, not only is this parsing difficult; but the code often breaks when the user interface
185 is modified in any way. With web services the returned cgi scripts are designed to be both simple to parse
185 is modified in any way. With web services the returned cgi scripts are designed to be both simple to parse
186 and stable.</p>
186 and stable.</p>
187 <p>The web services are not implemented according to the SOAP or XMLRPC standard since not all scripting
187 <p>The web services are not implemented according to the SOAP or XMLRPC standard since not all scripting
188 languages have support for these standards (or for XML parsing). Instead they use the simple approach
188 languages have support for these standards (or for XML parsing). Instead they use the simple approach
189 of returning data requested via a query as a delimited text file. These web services are fully
189 of returning data requested via a query as a delimited text file. These web services are fully
190 documented <a href="{% url 'docs' 'rt_webServices.html' %}">here.</a></p>
190 documented <a href="{% url 'docs' 'rt_webServices.html' %}">here.</a></p>
191 <p>Users who want only to write programs to remotely access Madrigal, and not to install a Madrigal server
191 <p>Users who want only to write programs to remotely access Madrigal, and not to install a Madrigal server
192 themselves, are now able to <a href="http://www.haystack.mit.edu/madrigal/madDownload.html"> download </a>
192 themselves, are now able to <a href="http://www.haystack.mit.edu/madrigal/madDownload.html"> download </a>
193 the remote python and Matlab API's from the
193 the remote python and Matlab API's from the
194 <a href="http://www.openmadrigal.org">OpenMadrigal</a> site.</p>
194 <a href="http://www.openmadrigal.org">OpenMadrigal</a> site.</p>
195 <h2> Command-line global search</h2>
195 <h2> Command-line global search</h2>
196 <p>As an example of remote programming access to Madrigal via web services, an application
196 <p>As an example of remote programming access to Madrigal via web services, an application
197 <a href="rt_python.html#globalIsprint">globalIsprint</a> was written
197 <a href="rt_python.html#globalIsprint">globalIsprint</a> was written
198 using the python remote API that does a global search of data on any Madrigal site that has installed Madrigal version
198 using the python remote API that does a global search of data on any Madrigal site that has installed Madrigal version
199 2.3. This application is installed as part of Madrigal, and also when the standalone remote python
199 2.3. This application is installed as part of Madrigal, and also when the standalone remote python
200 API is installed. It has all the filtering ability of the web-based global search.</p>
200 API is installed. It has all the filtering ability of the web-based global search.</p>
201 <h2>Calculate any derivable Madrigal parameter for any time and point(s) in space</h2>
201 <h2>Calculate any derivable Madrigal parameter for any time and point(s) in space</h2>
202 <p>By clicking on "Run Models", users can calculate any derived Madrigal parameter (such as magnetic fields,
202 <p>By clicking on "Run Models", users can calculate any derived Madrigal parameter (such as magnetic fields,
203 or geophysical parameters) for arbitrary times and ranges of position. Note that this capability is also
203 or geophysical parameters) for arbitrary times and ranges of position. Note that this capability is also
204 available as a web service, and through the remote python and Matlab API's.</p>
204 available as a web service, and through the remote python and Matlab API's.</p>
205 <h2>New derived parameters</h2>
205 <h2>New derived parameters</h2>
206 <ul>
206 <ul>
207 <li>
207 <li>
208 CGM_LAT: <b>Corrected geomagnetic latitude</b> (deg) <br>
208 CGM_LAT: <b>Corrected geomagnetic latitude</b> (deg) <br>
209 This parameter gives the location of a point in Corrected geomagnetic latitude.
209 This parameter gives the location of a point in Corrected geomagnetic latitude.
210 This method uses code developed by Vladimir Papitashvili. For more information on CGM coordinates
210 This method uses code developed by Vladimir Papitashvili. For more information on CGM coordinates
211 and this code, click <a href="https://omniweb.gsfc.nasa.gov/vitmo/cgmm_des.html"> here.</a></li>
211 and this code, click <a href="https://omniweb.gsfc.nasa.gov/vitmo/cgmm_des.html"> here.</a></li>
212 <li>
212 <li>
213 CGM_LONG: <b>Corrected geomagnetic longitude</b> (deg) <br>
213 CGM_LONG: <b>Corrected geomagnetic longitude</b> (deg) <br>
214 This parameter gives the location of a point in Corrected geomagnetic longitude.
214 This parameter gives the location of a point in Corrected geomagnetic longitude.
215 This method uses code developed by Vladimir Papitashvili. For more information on CGM coordinates
215 This method uses code developed by Vladimir Papitashvili. For more information on CGM coordinates
216 and this code, click <a href="https://omniweb.gsfc.nasa.gov/vitmo/cgmm_des.html"> here.</a></li>
216 and this code, click <a href="https://omniweb.gsfc.nasa.gov/vitmo/cgmm_des.html"> here.</a></li>
217 <li>
217 <li>
218 TSYG_EQ_XGSM: <b>Tsyganenko field GSM XY plane X point</b> (earth radii) <br>
218 TSYG_EQ_XGSM: <b>Tsyganenko field GSM XY plane X point</b> (earth radii) <br>
219 This parameter gives the X value in GSM coordinates of where the field line associated
219 This parameter gives the X value in GSM coordinates of where the field line associated
220 with a given input point in space and time crosses the GSM XY plane (the magnetic equatorial plane). GSM stands for
220 with a given input point in space and time crosses the GSM XY plane (the magnetic equatorial plane). GSM stands for
221 Geocentric Solar Magnetospheric System, and its XY plane is the equatorial plane of
221 Geocentric Solar Magnetospheric System, and its XY plane is the equatorial plane of
222 the earth's magnetic dipole field. The field lines are traced using the
222 the earth's magnetic dipole field. The field lines are traced using the
223 Tsyganenko
223 Tsyganenko
224 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
224 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
225 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
225 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
226 over the past hour, instead of simply using present values.</li>
226 over the past hour, instead of simply using present values.</li>
227 <li> TSYG_EQ_YGSM: <b>Tsyganenko field GSM XY plane Y point</b> (earth radii) <br>
227 <li> TSYG_EQ_YGSM: <b>Tsyganenko field GSM XY plane Y point</b> (earth radii) <br>
228 This parameter gives the Y value in GSM coordinates of where the field line associated
228 This parameter gives the Y value in GSM coordinates of where the field line associated
229 with a given input point in space and time crosses the GSM XY plane (the magnetic equatorial plane). GSM stands for
229 with a given input point in space and time crosses the GSM XY plane (the magnetic equatorial plane). GSM stands for
230 Geocentric Solar Magnetospheric System, and its XY plane is the equatorial plane of
230 Geocentric Solar Magnetospheric System, and its XY plane is the equatorial plane of
231 the earth's magnetic dipole field. The field lines are traced using the Tsyganenko
231 the earth's magnetic dipole field. The field lines are traced using the Tsyganenko
232 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
232 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
233 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
233 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
234 over the past hour, instead of simply using present values.</li>
234 over the past hour, instead of simply using present values.</li>
235 <li> TSYG_EQ_XGSM: <b>Tsyganenko field GSE XY plane X point</b> (earth radii) <br>
235 <li> TSYG_EQ_XGSM: <b>Tsyganenko field GSE XY plane X point</b> (earth radii) <br>
236 This parameter gives the X value in GSE coordinates of where the field line associated
236 This parameter gives the X value in GSE coordinates of where the field line associated
237 with a given input point in space and time crosses the GSE XY plane (the equatorial plane). GSE stands for
237 with a given input point in space and time crosses the GSE XY plane (the equatorial plane). GSE stands for
238 Geocentric Solar Ecliptic System, and its XY plane is the equatorial plane of
238 Geocentric Solar Ecliptic System, and its XY plane is the equatorial plane of
239 the earth's rotation. The field lines are traced using the Tsyganenko
239 the earth's rotation. The field lines are traced using the Tsyganenko
240 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
240 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
241 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
241 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
242 over the past hour, instead of simply using present values.</li>
242 over the past hour, instead of simply using present values.</li>
243 <li> TSYG_EQ_YGSM: <b>Tsyganenko field GSE XY plane Y point</b> (earth radii) <br>
243 <li> TSYG_EQ_YGSM: <b>Tsyganenko field GSE XY plane Y point</b> (earth radii) <br>
244 This parameter gives the Y value in GSE coordinates of where the field line associated
244 This parameter gives the Y value in GSE coordinates of where the field line associated
245 with a given input point in space and time crosses the GSE XY plane (the equatorial plane). GSE stands for
245 with a given input point in space and time crosses the GSE XY plane (the equatorial plane). GSE stands for
246 Geocentric Solar Ecliptic System, and its XY plane is the equatorial plane of
246 Geocentric Solar Ecliptic System, and its XY plane is the equatorial plane of
247 the earth's rotation. The field lines are traced using the Tsyganenko
247 the earth's rotation. The field lines are traced using the Tsyganenko
248 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
248 Magnetospheric model, so external effects on the earth's magnetic field such the solar wind are
249 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
249 taken into account. This code uses the 2001 Tsyganenko model, which averages solar wind values
250 over the past hour, instead of simply using present values.</li>
250 over the past hour, instead of simply using present values.</li>
251 <li> BHHMMSS and EHHMMSS: <b>Start and end time in HHMMSS</b> (suggested by Mary McCready at SRI)</li>
251 <li> BHHMMSS and EHHMMSS: <b>Start and end time in HHMMSS</b> (suggested by Mary McCready at SRI)</li>
252 </ul>
252 </ul>
253 <h2>Bug fixes</h2>
253 <h2>Bug fixes</h2>
254 <p>The Madrigal C API now no longer aborts when a Cedar file contains cycle marks (Cedar
254 <p>The Madrigal C API now no longer aborts when a Cedar file contains cycle marks (Cedar
255 parameter 95) that are not in order. (Reported by Angela Li, SRI)</p>
255 parameter 95) that are not in order. (Reported by Angela Li, SRI)</p>
256 <p>A problem launching the global search with the python module os.spawnlp was fixed.
256 <p>A problem launching the global search with the python module os.spawnlp was fixed.
257 (Reported by Angela Li, SRI)</p>
257 (Reported by Angela Li, SRI)</p>
258 </blockquote>
258 </blockquote>
259 <p>&nbsp;</p>
259 <p>&nbsp;</p>
260 <hr></hr>
260 <hr></hr>
261 <h1>
261 <h1>
262 Madrigal 2.2 Release - Feb 2003</h1>
262 Madrigal 2.2 Release - Feb 2003</h1>
263
263
264
264
265 <blockquote>
265 <blockquote>
266 <h2>New derived parameters</h2>
266 <h2>New derived parameters</h2>
267 <ul>
267 <ul>
268 <li>
268 <li>
269 SUNRISE_HOUR - <b>Ionospheric sunrise</b> (hour)<br>
269 SUNRISE_HOUR - <b>Ionospheric sunrise</b> (hour)<br>
270 This parameter gives the hour UT that sunrise occurs at that particular
270 This parameter gives the hour UT that sunrise occurs at that particular
271 point in space that particular day. If that point in space is either in sunlight or in shadow
271 point in space that particular day. If that point in space is either in sunlight or in shadow
272 the entire UT day, sunrise_hour will be missing. To find out which, display the
272 the entire UT day, sunrise_hour will be missing. To find out which, display the
273 Shadow height (SDWHT) parameter. If shadow height is less that the altitude of the
273 Shadow height (SDWHT) parameter. If shadow height is less that the altitude of the
274 point, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
274 point, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
275 <li>SUNSET_HOUR - <b>Ionospheric sunset</b> (hour)<br>
275 <li>SUNSET_HOUR - <b>Ionospheric sunset</b> (hour)<br>
276 This parameter gives the hour UT that sunset occurs at that particular
276 This parameter gives the hour UT that sunset occurs at that particular
277 point in space that particular day. If that point in space is either in sunlight or in shadow
277 point in space that particular day. If that point in space is either in sunlight or in shadow
278 the entire UT day, sunset_hour will be missing. To find out which, display the
278 the entire UT day, sunset_hour will be missing. To find out which, display the
279 Shadow height (SDWHT) parameter. If shadow height is less that the altitude of the
279 Shadow height (SDWHT) parameter. If shadow height is less that the altitude of the
280 point, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
280 point, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
281 <li>CONJ_SUNRISE_H - <b>Magnetic conjugate point sunrise</b> (hour)<br>
281 <li>CONJ_SUNRISE_H - <b>Magnetic conjugate point sunrise</b> (hour)<br>
282 This parameter gives the hour UT that sunrise occurs at the magnetic conjugate point of the particular
282 This parameter gives the hour UT that sunrise occurs at the magnetic conjugate point of the particular
283 point in space that particular day.</li>
283 point in space that particular day.</li>
284 <li>CONJ_SUNSET_H - <b>Magnetic conjugate point sunset</b> (hour)<br>
284 <li>CONJ_SUNSET_H - <b>Magnetic conjugate point sunset</b> (hour)<br>
285 This parameter gives the hour UT that sunset occurs at the magnetic conjugate point of the particular
285 This parameter gives the hour UT that sunset occurs at the magnetic conjugate point of the particular
286 point in space that particular day.</li>
286 point in space that particular day.</li>
287 <li>SZEN - <b>Solar zenith angle in measurement vol</b> (deg) <br>
287 <li>SZEN - <b>Solar zenith angle in measurement vol</b> (deg) <br>
288 This parameter gives the solar zenith angle in degrees. If 0 degrees, the sun is directly
288 This parameter gives the solar zenith angle in degrees. If 0 degrees, the sun is directly
289 overhead. A solar zenith angle of between 90 and 180 degrees does not mean the sun is not
289 overhead. A solar zenith angle of between 90 and 180 degrees does not mean the sun is not
290 visible, due to the finite solid angle of the sun and the altitude the point may be above the
290 visible, due to the finite solid angle of the sun and the altitude the point may be above the
291 earth's surface.</li>
291 earth's surface.</li>
292 <li>SZENC - <b>Conjugate solar zenith angle</b> (deg) <br>
292 <li>SZENC - <b>Conjugate solar zenith angle</b> (deg) <br>
293 This parameter gives the solar zenith angle at the magnetic conjugate point in degrees.</li>
293 This parameter gives the solar zenith angle at the magnetic conjugate point in degrees.</li>
294 <li>SDWHT - <b>Shadow height</b> (km) <br>
294 <li>SDWHT - <b>Shadow height</b> (km) <br>
295 This parameter gives the height above the earth's surface at which any part of the sun can be seen. It depends only
295 This parameter gives the height above the earth's surface at which any part of the sun can be seen. It depends only
296 on the time, and on the geodetic latitude and longitude. During the day shadow height will be zero. Since the sun is
296 on the time, and on the geodetic latitude and longitude. During the day shadow height will be zero. Since the sun is
297 larger than the earth, the shadow height is always finite. If shadow height is less that the altitude of a given
297 larger than the earth, the shadow height is always finite. If shadow height is less that the altitude of a given
298 point in space, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
298 point in space, its in sunlight; if shadow height is greater than the altitude, its in the earth's shadow.</li>
299 <li>MAGCONJSDWHT - <b>Magnetic conjugate shadow height</b> (km) <br>
299 <li>MAGCONJSDWHT - <b>Magnetic conjugate shadow height</b> (km) <br>
300 This parameter gives the height above the earth's surface at the magnetic conjugate point's latitude and longitude at
300 This parameter gives the height above the earth's surface at the magnetic conjugate point's latitude and longitude at
301 which any part of the sun can be seen. </li>
301 which any part of the sun can be seen. </li>
302 <li><b>10 Interplanetary Magnetic Field parameters</b><br>
302 <li><b>10 Interplanetary Magnetic Field parameters</b><br>
303 Includes field strength in GSM or GSE coordinates, solar wind plasma density, speed, and measuring satellite id.
303 Includes field strength in GSM or GSE coordinates, solar wind plasma density, speed, and measuring satellite id.
304 Click on any parameter to see the definition of the two coordinate systems.</li>
304 Click on any parameter to see the definition of the two coordinate systems.</li>
305 </ul>
305 </ul>
306 <h2>Filtering using any parameter</h2>
306 <h2>Filtering using any parameter</h2>
307 <ul>
307 <ul>
308 <li>There are now also free-form filters at the end
308 <li>There are now also free-form filters at the end
309 of the filter section, which allow you to set up filters based on any
309 of the filter section, which allow you to set up filters based on any
310 single parameter or on two parameters either added,
310 single parameter or on two parameters either added,
311 subtracted, multiplied, or divided together. For example, you can now filter on
311 subtracted, multiplied, or divided together. For example, you can now filter on
312 Ti, the ratio Ti/dTi, or gdalt-sdwht (which is positive if the point is in sunlight).
312 Ti, the ratio Ti/dTi, or gdalt-sdwht (which is positive if the point is in sunlight).
313 See the tutorial for more details.</li>
313 See the tutorial for more details.</li>
314 </ul>
314 </ul>
315 <h2>Better help understanding what each parameter means</h2>
315 <h2>Better help understanding what each parameter means</h2>
316 <ul>
316 <ul>
317 <li>Complex parameters now have full html descriptions accessible from the isprint page.
317 <li>Complex parameters now have full html descriptions accessible from the isprint page.
318 Just click on the parameter name and you'll see the short description. For more complex
318 Just click on the parameter name and you'll see the short description. For more complex
319 parameters you'll also see a link to a more detailed explanation.</li>
319 parameters you'll also see a link to a more detailed explanation.</li>
320 </ul>
320 </ul>
321 <h2>Improved data output</h2>
321 <h2>Improved data output</h2>
322 <ul>
322 <ul>
323 <li>If you select only 1D parameters, or derived parameters that depend only on other 1D parameters,
323 <li>If you select only 1D parameters, or derived parameters that depend only on other 1D parameters,
324 isprint will only print a single line per record, making it easier to read.</li>
324 isprint will only print a single line per record, making it easier to read.</li>
325 <li>All filters used are printed at the beginning of the report. Trivial filters that don't exclude
325 <li>All filters used are printed at the beginning of the report. Trivial filters that don't exclude
326 data (such as elevation from 0 to 90 degrees) are ignored.</li>
326 data (such as elevation from 0 to 90 degrees) are ignored.</li>
327 </ul>
327 </ul>
328 <h2>Better consistency with Cedar standard</h2>
328 <h2>Better consistency with Cedar standard</h2>
329 <ul>
329 <ul>
330 <li>All units are now consistent with the Cedar standard (when displaying Cedar parameters).</li>
330 <li>All units are now consistent with the Cedar standard (when displaying Cedar parameters).</li>
331 <li>The special Cedar values "missing", "assumed", and "known bad" are differentiated in isprint output,
331 <li>The special Cedar values "missing", "assumed", and "known bad" are differentiated in isprint output,
332 and not all lumped together as "missing" as before.</li>
332 and not all lumped together as "missing" as before.</li>
333 <li>Unknown parameter codes displayed with a scale factor of 1.0.</li>
333 <li>Unknown parameter codes displayed with a scale factor of 1.0.</li>
334 </ul>
334 </ul>
335 <h2>New derived parameters are simple to add</h2>
335 <h2>New derived parameters are simple to add</h2>
336 <ul>
336 <ul>
337 <li>The isprint web page is now based on the madc library, and has been designed to
337 <li>The isprint web page is now based on the madc library, and has been designed to
338 make it extremely simple to add new derived parameters. See the
338 make it extremely simple to add new derived parameters. See the
339 madc API documentation for details.</li>
339 madc API documentation for details.</li>
340 </ul>
340 </ul>
341 </blockquote>
341 </blockquote>
342 <!-- InstanceEndEditable -->
342 <!-- InstanceEndEditable -->
343 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
343 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
344 <tr>
344 <tr>
345 <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
345 <td width="5%"><a href="{% url 'docs' 'madIntroduction.html' %}"><img src="/madrigal/static/previous.png" alt="previous" width="32" height="32" /></a></td>
346 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/static/up.png" alt="up" width="32" height="32" /></a></td>
346 <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="/madrigal/static/up.png" alt="up" width="32" height="32" /></a></td>
347 <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/static/next.png" alt="next" width="32" height="32" /></a></td>
347 <td width="5%"><a href="{% url 'docs' 'wt_usersGuide.html' %}"><img src="/madrigal/static/next.png" alt="next" width="32" height="32" /></a></td>
348 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->What's new in Madrigal 3.0?<!-- InstanceEndEditable --></td>
348 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->What's new in Madrigal 3.0?<!-- InstanceEndEditable --></td>
349 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
349 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
350 <td width="18%"><a href="/">Madrigal home</a></td>
350 <td width="18%"><a href="/">Madrigal home</a></td>
351 </tr>
351 </tr>
352 </table>
352 </table>
353 <div class='online-navigation'>
353 <div class='online-navigation'>
354 <b class="navlabel">Previous:</b>
354 <b class="navlabel">Previous:</b>
355 <a class="sectref" href="{% url 'docs' 'madIntroduction.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Brief History <!-- InstanceEndEditable --></A>
355 <a class="sectref" href="{% url 'docs' 'madIntroduction.html' %}"><!-- InstanceBeginEditable name="PreviousTitle2" -->Brief History <!-- InstanceEndEditable --></A>
356 <b class="navlabel">&nbsp;&nbsp;Up:</b>
356 <b class="navlabel">&nbsp;&nbsp;Up:</b>
357 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
357 <a class="sectref" href="{% url 'docs' 'madContents.html' %}"><!-- InstanceBeginEditable name="UpTitle2" -->Doc home <!-- InstanceEndEditable --></A>
358 <b class="navlabel">&nbsp;&nbsp;Next:</b>
358 <b class="navlabel">&nbsp;&nbsp;Next:</b>
359 <a class="sectref" href="{% url 'docs' 'wt_usersGuide.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Madrigal user's guide <!-- InstanceEndEditable --></A></div>
359 <a class="sectref" href="{% url 'docs' 'wt_usersGuide.html' %}"><!-- InstanceBeginEditable name="NextTitle2" -->Madrigal user's guide <!-- InstanceEndEditable --></A></div>
360 <hr/>
360 <hr/>
361 <p>&nbsp;</p>
361 <p>&nbsp;</p>
362 </body>
362 </body>
363 <!-- InstanceEnd --></html>
363 <!-- InstanceEnd --></html>
Show file before | Show file after | Hide comments
@@ -1,242 +1,241
1 '''
1 '''
2 Created on Jul 16, 2013
2 Created on Jul 16, 2013
3
3
4 @author: Jose Antonio Sal y Rosas Celi
4 @author: Jose Antonio Sal y Rosas Celi
5 @contact: arturo.jasyrc@gmail.com
5 @contact: arturo.jasyrc@gmail.com
6
6
7 As imported and slightly modified by Bill Rideout Jan 20, 2015
7 As imported and slightly modified by Bill Rideout Jan 20, 2015
8
8
9 $Id: urls.py 7246 2020-10-12 14:54:26Z brideout $
9 $Id: urls.py 7246 2020-10-12 14:54:26Z brideout $
10 '''
10 '''
11
11
12 from django.conf.urls import url
12 from django.conf.urls import url
13 from . import views
13 from . import views
14
14
15 urlpatterns = [ url(r'^$',
15 urlpatterns = [ url(r'^$',
16 views.index,
16 views.index,
17 name='index'),
17 name='index'),
18 url(r'^index.html/?$',
18 url(r'^index.html/?$',
19 views.index,
19 views.index,
20 name='index'),
20 name='index'),
21 url(r'^single/?$',
21 url(r'^single/?$',
22 views.check_registration(views.view_single),
22 views.check_registration(views.view_single),
23 name='view_single'),
23 name='view_single'),
24 url(r'^register/?$',
24 url(r'^register/?$',
25 views.view_registration,
25 views.view_registration,
26 name='view_registration'),
26 name='view_registration'),
27 url(r'^getCategories/?$',
27 url(r'^getCategories/?$',
28 views.get_categories,
28 views.get_categories,
29 name='get_categories'),
29 name='get_categories'),
30 url(r'^getInstruments/?$',
30 url(r'^getInstruments/?$',
31 views.get_instruments,
31 views.get_instruments,
32 name='get_instruments'),
32 name='get_instruments'),
33 url(r'^getYears/?$',
33 url(r'^getYears/?$',
34 views.get_years,
34 views.get_years,
35 name='get_years'),
35 name='get_years'),
36 url(r'^getMonths/?$',
36 url(r'^getMonths/?$',
37 views.get_months,
37 views.get_months,
38 name='get_months'),
38 name='get_months'),
39 url(r'^getCalendar/?$',
39 url(r'^getCalendar/?$',
40 views.get_calendar,
40 views.get_calendar,
41 name='get_calendar'),
41 name='get_calendar'),
42 url(r'^populateCalendarExperiment/?$',
42 url(r'^populateCalendarExperiment/?$',
43 views.populate_calendar_experiment,
43 views.populate_calendar_experiment,
44 name='populate_calendar_experiment'),
44 name='populate_calendar_experiment'),
45 url(r'^getFiles/?$',
45 url(r'^getFiles/?$',
46 views.get_files,
46 views.get_files,
47 name='get_files'),
47 name='get_files'),
48 url(r'^changeFiles/?$',
48 url(r'^changeFiles/?$',
49 views.change_files,
49 views.change_files,
50 name='change_files'),
50 name='change_files'),
51 url(r'^showPlots/?$',
51 url(r'^showPlots/?$',
52 views.show_plots,
52 views.show_plots,
53 name='show_plots'),
53 name='show_plots'),
54 url(r'^view_plot/?$',
54 url(r'^view_plot/?$',
55 views.view_plot,
55 views.view_plot,
56 name='plot'),
56 name='plot'),
57 url(r'^downloadAsIs/?$',
57 url(r'^downloadAsIs/?$',
58 views.download_as_is,
58 views.download_as_is,
59 name='download_as_is'),
59 name='download_as_is'),
60 url(r'^downloadFileAsIs/?$',
60 url(r'^downloadFileAsIs/?$',
61 views.download_file_as_is,
61 views.download_file_as_is,
62 name='download_file_as_is'),
62 name='download_file_as_is'),
63 url(r'^printAsIs/?$',
63 url(r'^printAsIs/?$',
64 views.print_as_is,
64 views.print_as_is,
65 name='print_as_is'),
65 name='print_as_is'),
66 url(r'^listRecords/?$',
66 url(r'^listRecords/?$',
67 views.list_records,
67 views.list_records,
68 name='list_records'),
68 name='list_records'),
69 url(r'^showInfo/?$',
69 url(r'^showInfo/?$',
70 views.show_info,
70 views.show_info,
71 name='show_info'),
71 name='show_info'),
72 url(r'^showDoi/?$',
72 url(r'^showDoi/?$',
73 views.show_doi,
73 views.show_doi,
74 name='show_doi'),
74 name='show_doi'),
75 url(r'^getAdvanced/?$',
75 url(r'^getAdvanced/?$',
76 views.get_advanced,
76 views.get_advanced,
77 name='get_advanced'),
77 name='get_advanced'),
78 url(r'^advancedDownload/?$',
78 url(r'^advancedDownload/?$',
79 views.advanced_download,
79 views.advanced_download,
80 name='advanced_download'),
80 name='advanced_download'),
81 url(r'^advancedPrint/?$',
81 url(r'^advancedPrint/?$',
82 views.advanced_print,
82 views.advanced_print,
83 name='advanced_print'),
83 name='advanced_print'),
84 url(r'^list/?$',
84 url(r'^list/?$',
85 views.check_registration(views.view_list),
85 views.check_registration(views.view_list),
86 name='view_list'),
86 name='view_list'),
87 url(r'^downloadAsIsScript/?$',
87 url(r'^downloadAsIsScript/?$',
88 views.download_as_is_script,
88 views.download_as_is_script,
89 name='download_as_is_script'),
89 name='download_as_is_script'),
90 url(r'^generateDownloadFilesScript/?$',
90 url(r'^generateDownloadFilesScript/?$',
91 views.generate_download_files_script,
91 views.generate_download_files_script,
92 name='generate_download_files_script'),
92 name='generate_download_files_script'),
93 url(r'^downloadAdvancedScript/?$',
93 url(r'^downloadAdvancedScript/?$',
94 views.download_advanced_script,
94 views.download_advanced_script,
95 name='download_advanced_script'),
95 name='download_advanced_script'),
96 url(r'^generateDownloadAdvancedScript/?$',
96 url(r'^generateDownloadAdvancedScript/?$',
97 views.generate_download_advanced_script,
97 views.generate_download_advanced_script,
98 name='generate_download_advanced_script'),
98 name='generate_download_advanced_script'),
99 url(r'^generateParmsScript/?$',
99 url(r'^generateParmsScript/?$',
100 views.generate_parms_script,
100 views.generate_parms_script,
101 name='generate_parms_script'),
101 name='generate_parms_script'),
102 url(r'^generateParmsFiltersScript/?$',
102 url(r'^generateParmsFiltersScript/?$',
103 views.generate_parms_filters_script,
103 views.generate_parms_filters_script,
104 name='generate_parms_filters_script'),
104 name='generate_parms_filters_script'),
105 url(r'^listExperiments/?$',
105 url(r'^listExperiments/?$',
106 views.list_experiments,
106 views.list_experiments,
107 name='list_experiments'),
107 name='list_experiments'),
108 url(r'^viewRecordPlot/?$',
108 url(r'^viewRecordPlot/?$',
109 views.view_record_plot,
109 views.view_record_plot,
110 name='view_record_plot'),
110 name='view_record_plot'),
111 url(r'^viewRecordImage/?$',
111 url(r'^viewRecordImage/?$',
112 views.view_record_image,
112 views.view_record_image,
113 name='view_record_image'),
113 name='view_record_image'),
114 url(r'^showExperiment/?$',
114 url(r'^showExperiment/?$',
115 views.check_registration(views.show_experiment),
115 views.check_registration(views.show_experiment),
116 name='show_experiment'),
116 name='show_experiment'),
117 url(r'^madExperiment.cgi/*$',
117 url(r'^madExperiment.cgi/*$',
118 views.check_registration(views.show_experiment_v2),
118 views.check_registration(views.show_experiment_v2),
119 name='show_experiment_v2'),
119 name='show_experiment_v2'),
120 url(r'^chooseScript/?$',
120 url(r'^chooseScript/?$',
121 views.check_registration(views.choose_script),
121 views.check_registration(views.choose_script),
122 name='choose_script'),
122 name='choose_script'),
123 url(r'^ftp/$',
123 url(r'^ftp/$',
124 views.check_registration(views.ftp),
124 views.check_registration(views.ftp),
125 name='ftp'),
125 name='ftp'),
126 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/$',
126 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/$',
127 views.ftp_instrument,
127 views.ftp_instrument,
128 name='ftp_instrument'),
128 name='ftp_instrument'),
129 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/$',
129 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/$',
130 views.ftp_year,
130 views.ftp_year,
131 name='ftp_year'),
131 name='ftp_year'),
132 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/$',
132 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/$',
133 views.ftp_kindat,
133 views.ftp_kindat,
134 name='ftp_kindat'),
134 name='ftp_kindat'),
135 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/$',
135 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/$',
136 views.ftp_files,
136 views.ftp_files,
137 name='ftp_files'),
137 name='ftp_files'),
138 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/fullFilename/([^/]+)/$',
138 url(r'^ftp/fullname/([^/]+)/email/([^/]+)/affiliation/([^/]+)/kinst/(\d+)/year/(\d+)/kindat/(\d+)/format/([^/]+)/fullFilename/([^/]+)/$',
139 views.ftp_download,
139 views.ftp_download,
140 name='ftp_download'),
140 name='ftp_download'),
141 url(r'ftpMultipleDownload/$',
141 url(r'ftpMultipleDownload/$',
142 views.ftp_multiple_download,
142 views.ftp_multiple_download,
143 name='ftp_multiple_download'),
143 name='ftp_multiple_download'),
144 url(r'^instMetadata/?$',
144 url(r'^instMetadata/?$',
145 views.instrument_metadata,
145 views.instrument_metadata,
146 name='instrument_metadata'),
146 name='instrument_metadata'),
147 url(r'^siteMetadata/?$',
147 url(r'^siteMetadata/?$',
148 views.site_metadata,
148 views.site_metadata,
149 name='site_metadata'),
149 name='site_metadata'),
150 url(r'^parameterMetadata/?$',
150 url(r'^parameterMetadata/?$',
151 views.parameter_metadata,
151 views.parameter_metadata,
152 name='parameter_metadata'),
152 name='parameter_metadata'),
153 url(r'^kindatMetadata/?$',
153 url(r'^kindatMetadata/?$',
154 views.kindat_metadata,
154 views.kindat_metadata,
155 name='kindat_metadata'),
155 name='kindat_metadata'),
156 url(r'^madCalculator/?$',
156 url(r'^madCalculator/?$',
157 views.madrigal_calculator,
157 views.madrigal_calculator,
158 name='madrigal_calculator'),
158 name='madrigal_calculator'),
159 url(r'^madCalculatorOutput/?$',
159 url(r'^madCalculatorOutput/?$',
160 views.madrigal_calculator_output,
160 views.madrigal_calculator_output,
161 name='madrigal_calculator_output'),
161 name='madrigal_calculator_output'),
162 url(r'^getMetadata/*$',
162 url(r'^getMetadata/*$',
163 views.get_metadata,
163 views.get_metadata,
164 name='get_metadata'),
164 name='get_metadata'),
165 url(r'^looker/?$',
165 url(r'^looker/?$',
166 views.looker_main,
166 views.looker_main,
167 name='looker_main'),
167 name='looker_main'),
168 url(r'^lookerForm/?$',
168 url(r'^lookerForm/?$',
169 views.looker_form,
169 views.looker_form,
170 name='looker_form'),
170 name='looker_form'),
171 url(r'^lookerOutput/?$',
171 url(r'^lookerOutput/?$',
172 views.looker_output,
172 views.looker_output,
173 name='looker_output'),
173 name='looker_output'),
174 url(r'^getVersionService.py/*$',
174 url(r'^getVersionService.py/*$',
175 views.get_version_service,
175 views.get_version_service,
176 name='get_version_service'),
176 name='get_version_service'),
177 url(r'^getInstrumentsService.py/*$',
177 url(r'^getInstrumentsService.py/*$',
178 views.get_instruments_service,
178 views.get_instruments_service,
179 name='get_instruments_service'),
179 name='get_instruments_service'),
180 url(r'^getExperimentsService.py/*$',
180 url(r'^getExperimentsService.py/*$',
181 views.get_experiments_service,
181 views.get_experiments_service,
182 name='get_experiments_service'),
182 name='get_experiments_service'),
183 url(r'^getExperimentFilesService.py/*$',
183 url(r'^getExperimentFilesService.py/*$',
184 views.get_experiment_files_service,
184 views.get_experiment_files_service,
185 name='get_experiment_files_service'),
185 name='get_experiment_files_service'),
186 url(r'^getParametersService.py/*$',
186 url(r'^getParametersService.py/*$',
187 views.get_parameters_service,
187 views.get_parameters_service,
188 name='get_parameters_service'),
188 name='get_parameters_service'),
189 url(r'^isprintService.py/*$',
189 url(r'^isprintService.py/*$',
190 views.isprint_service,
190 views.isprint_service,
191 name='isprint_service'),
191 name='isprint_service'),
192 url(r'^getMadfile.cgi/*$',
192 url(r'^getMadfile.cgi/*$',
193 views.get_madfile_service,
193 views.get_madfile_service,
194 name='get_madfile_service'),
194 name='get_madfile_service'),
195 url(r'^madCalculatorService.py/*$',
195 url(r'^madCalculatorService.py/*$',
196 views.mad_calculator_service,
196 views.mad_calculator_service,
197 name='mad_calculator_service'),
197 name='mad_calculator_service'),
198 url(r'^madTimeCalculatorService.py/*$',
198 url(r'^madTimeCalculatorService.py/*$',
199 views.mad_time_calculator_service,
199 views.mad_time_calculator_service,
200 name='mad_time_calculator_service'),
200 name='mad_time_calculator_service'),
201 url(r'^madCalculator2Service.py/*$',
201 url(r'^madCalculator2Service.py/*$',
202 views.mad_calculator2_service,
202 views.mad_calculator2_service,
203 name='mad_calculator2_service'),
203 name='mad_calculator2_service'),
204 url(r'^madCalculator2Service.py',
204 url(r'^madCalculator2Service.py',
205 views.mad_calculator2_service,
205 views.mad_calculator2_service,
206 name='mad_calculator2_service'),
206 name='mad_calculator2_service'),
207 url(r'^madCalculator3Service.py/*$',
207 url(r'^madCalculator3Service.py/*$',
208 views.mad_calculator3_service,
208 views.mad_calculator3_service,
209 name='mad_calculator3_service'),
209 name='mad_calculator3_service'),
210 url(r'^madCalculator3Service.py',
210 url(r'^madCalculator3Service.py',
211 views.mad_calculator3_service,
211 views.mad_calculator3_service,
212 name='mad_calculator3_service'),
212 name='mad_calculator3_service'),
213 url(r'^geodeticToRadarService.py',
213 url(r'^geodeticToRadarService.py',
214 views.geodetic_to_radar_service,
214 views.geodetic_to_radar_service,
215 name='geodetic_to_radar_service'),
215 name='geodetic_to_radar_service'),
216 url(r'^radarToGeodeticService.py',
216 url(r'^radarToGeodeticService.py',
217 views.radar_to_geodetic_service,
217 views.radar_to_geodetic_service,
218 name='radar_to_geodetic_service'),
218 name='radar_to_geodetic_service'),
219 url(r'^listFileTimesService.py',
219 url(r'^listFileTimesService.py',
220 views.list_file_times_service,
220 views.list_file_times_service,
221 name='list_file_times_service'),
221 name='list_file_times_service'),
222 url(r'^downloadWebFileService.py',
222 url(r'^downloadWebFileService.py',
223 views.download_web_file_service,
223 views.download_web_file_service,
224 name='download_web_file_service'),
224 name='download_web_file_service'),
225 url(r'^traceMagneticFieldService.py',
225 url(r'^traceMagneticFieldService.py',
226 views.trace_magnetic_field_service,
226 views.trace_magnetic_field_service,
227 name='trace_magnetic_field_service'),
227 name='trace_magnetic_field_service'),
228 url(r'^globalFileSearchService.py',
228 url(r'^globalFileSearchService.py',
229 views.global_file_search_service,
229 views.global_file_search_service,
230 name='global_file_search_service'),
230 name='global_file_search_service'),
231 url(r'^getUrlListFromGroupIdService.py',
231 url(r'^getUrlListFromGroupIdService.py',
232 views.get_url_list_from_group_id_service,
232 views.get_url_list_from_group_id_service,
233 name='get_url_list_from_group_id_service'),
233 name='get_url_list_from_group_id_service'),
234 url(r'^setGroupIdFromUrlListService.py',
234 url(r'^setGroupIdFromUrlListService.py',
235 views.set_group_id_from_url_list_service,
235 views.set_group_id_from_url_list_service,
236 name='set_group_id_from_url_list_service'),
236 name='set_group_id_from_url_list_service'),
237 url(r'docs/name/(.+)$',
237 url(r'docs/name/(.+)$',
238 views.docs,
238 views.docs,
239 name='docs'),
239 name='docs'),
240
240
241 ]
241 ]
242
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now