Skip to content

Deslabs refreshvistools #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: deslabs-s2se2
Choose a base branch
from
Open

Deslabs refreshvistools #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2fdac2
Re-added data-analysis. Fixed some formatting in the code.
lgelman2 Oct 5, 2019
6ecb1ef
condensed the manual/csv coords/coadd options into just the csv vs ma…
lgelman2 Oct 6, 2019
edc404a
fixed code formatting
lgelman2 Oct 6, 2019
f3aab53
added url for the new data analysis manual entry
lgelman2 Oct 6, 2019
b4d7f66
fixes vistools, updated to app_log statements, condensed to manual/cs…
lgelman2 Oct 6, 2019
0032dad
re-added vistools; fixed code formatting
lgelman2 Oct 6, 2019
05d31ad
vulcanized
lgelman2 Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 73 additions & 12 deletions dr1_vistools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@
import MySQLdb as mydb
import yaml
import ea_tasks
import pandas as pd
from Settings import app_log

def dt_t(entry):
t = dt.datetime.strptime(entry['time'], '%a %b %d %H:%M:%S %Y')
return t.strftime('%Y-%m-%d %H:%M:%S')


class BaseHandler(tornado.web.RequestHandler):
def get_current_user(self):
return self.get_secure_cookie("usera")
Expand Down Expand Up @@ -64,9 +67,45 @@ def post(self):

stype = self.get_argument("da_submit_type")

jobid = str(uuid.uuid4()).replace("-", "_")
app_log.info('***** JOB *****')
app_log.info('Data Analysis Job: {} by {}'.format(jobid, loc_user))
app_log.info('radius: {}'.format(boxsize))
app_log.info('surveys - WISE, VHS: {} {}'.format(addwise, addvhs))
app_log.info('plot flux vs wavelength: {}'.format(fluxwav))
app_log.info('plot magnitude vs wavelength: {}'.format(magwav))
app_log.info('plot g-r vs r-i: {}'.format(grri))
app_log.info('plot g-z vs z-W1: {}'.format(gzzw1))
app_log.info('plot spread vs magnitude: {}'.format(spreadmag))
app_log.info('send email: {}'.format(send_email))
app_log.info('email: {}'.format(email))
app_log.info('name: {}'.format(name))
app_log.info('input type: {}'.format(stype))

if boxsize == 0.0:
boxsize = 4.0

filename = user_folder + jobid + '.csv'

if stype == 'csvfileDA':
fileinfo = self.request.files['csvfile'][0]
with open(filename, 'w') as F:
F.write(fileinfo['body'].decode('ascii'))
if stype == 'manualDA':
values = self.get_argument('da_positions')
F = open(filename, 'w')
F.write(values.upper())
F.close()
app_log.info('**************')





"""
useCoadds = False
useCoords = False

print('**************')
print(boxsize, 'radius')
print(addwise, addvhs, 'additional surveys')
Expand Down Expand Up @@ -104,7 +143,7 @@ def post(self):
extn = os.path.splitext(fname)[1]
print(fname)
print(fileinfo['content_type'])
filename = user_folder+jobid+extn
filename = user_folder+jobid+'.csv'
with open(filename, 'w') as F:
F.write(fileinfo['body'].decode('ascii'))
if stype == "coordfile":
Expand All @@ -114,21 +153,43 @@ def post(self):
extn = os.path.splitext(fname)[1]
print(fname)
print(fileinfo['content_type'])
filename = user_folder+jobid+extn
filename = user_folder+jobid+'.csv'
with open(filename, 'w') as F:
F.write(fileinfo['body'].decode('ascii'))
print('**************')
"""

folder2 = user_folder+jobid+'/'
os.system('mkdir -p '+folder2)
now = datetime.datetime.now()
input_csv = user_folder + jobid + '.csv'
input_type = 'coadds' if useCoadds else 'coords'
#input_type = 'coadds' if useCoadds else 'coords'

dftemp = pd.DataFrame(pd.read_csv(input_csv))
if 'RA' in dftemp.columns or 'ra' in dftemp.columns:
input_type = 'coords'
if 'COADD_OBJECT_ID' in dftemp.columns or 'coadd_object_id' in dftemp.columns:
input_type = 'coadds'

run = ea_tasks.run_vistools.apply_async(args=[input_type, input_csv, loc_user,
lp.decode(), folder2, db, boxsize,
fluxwav, magwav, grri, gzzw1, spreadmag,
addwise, addvhs,
jobid, send_email, email], retry=True, task_id=jobid)
run = ea_tasks.run_vistools.apply_async(args=[input_type,
input_csv,
loc_user,
lp.decode(),
folder2,
db,
boxsize,
fluxwav,
magwav,
grri,
gzzw1,
spreadmag,
addwise,
addvhs,
jobid,
send_email,
email],
retry=True,
task_id=jobid)

with open('config/desaccess.yaml', 'r') as cfile:
conf = yaml.load(cfile)['mysql']
Expand All @@ -137,9 +198,9 @@ def post(self):
tup = tuple([loc_user, jobid, name, 'PENDING', now.strftime('%Y-%m-%d %H:%M:%S'),
'data analysis', '', '', '', -1])

with con:
cur = con.cursor()
cur.execute("INSERT INTO Jobs VALUES {0}".format(tup))
cur = con.cursor()
cur.execute("INSERT INTO Jobs VALUES {0}".format(tup))
con.commit()
con.close()
self.set_status(200)
self.flush()
Expand Down
57 changes: 29 additions & 28 deletions easyweb/static/des_components/des-mainpages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
<link rel="import" href="../styles/shared-styles.html">
<dom-module id="des-mainpages">
<template>
<style include="shared-styles"></style>
<style include="shared-styles"></style>

<app-location route="{{route}}"></app-location>
<app-route id="approute"
route="{{route}}"
pattern="/easyweb/:view"
data="{{routeData}}"
tail="{{subroute}}"></app-route>
<app-location route="{{route}}"></app-location>
<app-route id="approute"
route="{{route}}"
pattern="/easyweb/:view"
data="{{routeData}}"
tail="{{subroute}}">
</app-route>

<div style="height: 85%; overflow: auto;">
<iron-pages id="mainPages" selected=[[selection]]>
<des-home name={{name}} db={{db}}></des-home>
<des-query name="query-box" id="desQuery" username={{username}} db={{db}} email={{email}}></des-query>
<des-schema name="schema" choice="0"></des-schema>
<!--<des-all-tables name="schema"></des-all-tables>-->
<des-example-query></des-example-query>
<!--<des-coadds id="desCoadds" email={{email}}></des-coadds>-->
<!--
<des-cutouts id="desCutouts" email={{email}} choice="0"></des-cutouts>
-->
<des-bulk-cutouts id="desBulkCutouts" email={{email}} choice="0"></des-bulk-cutouts>
<des-s2se-cutouts id="desS2SECutouts" email={{email}} choice="0"></des-s2se-cutouts>
<des-jlabs username={{username}}></des-jlabs>
<des-finding-chart id="desFindingChart" email={{email}}></des-finding-chart>
<des-footprint id="FootprintPage"></des-footprint>
<!-- <des-data-analysis id="desDataAnalysis" email={{email}}></des-data-analysis> -->
<des-my-jobs></des-my-jobs>
<des-help></des-help>
<div style="height: 85%; overflow: auto;">
<iron-pages id="mainPages" selected=[[selection]]>
<des-home name={{name}} db={{db}}></des-home>
<des-query name="query-box" id="desQuery" username={{username}} db={{db}} email={{email}}></des-query>
<des-schema name="schema" choice="0"></des-schema>
<!--<des-all-tables name="schema"></des-all-tables>-->
<des-example-query></des-example-query>
<!--<des-coadds id="desCoadds" email={{email}}></des-coadds>-->
<!--
<des-cutouts id="desCutouts" email={{email}} choice="0"></des-cutouts>
-->
<des-bulk-cutouts id="desBulkCutouts" email={{email}} choice="0"></des-bulk-cutouts>
<des-s2se-cutouts id="desS2SECutouts" email={{email}} choice="0"></des-s2se-cutouts>
<des-jlabs username={{username}}></des-jlabs>
<des-finding-chart id="desFindingChart" email={{email}}></des-finding-chart>
<des-footprint id="FootprintPage"></des-footprint>
<des-data-analysis id="desDataAnalysis" email={{email}}></des-data-analysis>
<des-my-jobs></des-my-jobs>
<des-help></des-help>

</iron-pages>
</div>
</iron-pages>
</div>

</template>

Expand Down
Loading