-
Notifications
You must be signed in to change notification settings - Fork 499
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #153 from achael/dev
merged dev into main for 1.2.4
Showing
37 changed files
with
1,364 additions
and
931 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
FROM continuumio/miniconda2 | ||
FROM continuumio/miniconda3 | ||
|
||
# install gcc and common build dependencies | ||
RUN apt-get update \ | ||
&& apt-get install -y \ | ||
build-essential \ | ||
pylint | ||
|
||
WORKDIR /eht-imaging | ||
|
||
COPY . . | ||
COPY environment.yml environment.yml | ||
|
||
# install dependencies and fix tkinter error | ||
# https://stackoverflow.com/questions/37604289/tkinter-tclerror-no-display-name-and-no-display-environment-variable | ||
RUN conda install -y -c conda-forge pynfft \ | ||
&& pip install -r requirements.txt \ | ||
&& echo "backend: Agg" >> /opt/conda/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc | ||
RUN conda env create --name eht-imaging --file environment.yml | ||
RUN echo 'conda activate eht-imaging' >> ~/.bashrc | ||
#RUN echo "backend: Agg" >> /opt/conda/lib/python3.9/site-packages/matplotlib/mpl-data/matplotlibrc | ||
|
||
WORKDIR /eht-imaging | ||
COPY . . |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
#NAME X Y Z SEFDR SEFDL FR_PAR_ANGLE FR_ELEV_ANGLE FR_OFFSET[d] DR_RE DR_IM DL_RE DL_IM | ||
PV 5088967.9000 -301681.6000 3825015.8000 3600 3600 1 -1 0 0 0 0 0 | ||
#NAME X Y Z SEFDR SEFDL FR_PAR_ANGLE FR_ELEV_ANGLE FR_OFFSET[d] DR_RE DR_IM DL_RE DL_IM | ||
PV 5088967.9000 -301681.6000 3825015.8000 3600 3600 1 -1 0 0 0 0 0 | ||
SMT -1828796.200 -5054406.800 3427865.200 14400 14400 1 1 0 0 0 0 0 | ||
SMA -5464523.400 -2493147.080 2150611.750 5600 6500 1 -1 45 0 0 0 0 | ||
SMA -5464523.400 -2493147.080 2150611.750 5600 6500 1 -1 45 0 0 0 0 | ||
LMT -768713.9637 -5988541.7982 2063275.9472 3600 3600 1 -1 0 0 0 0 0 | ||
ALMA 2225061.164 -5440057.37 -2481681.15 70 70 1 0 0 0 0 0 0 | ||
ALMA 2225061.164 -5440057.37 -2481681.15 70 70 1 0 0 0 0 0 0 | ||
SPT 0.01 0.01 -6359609.7 16900 16900 1 0 0 0 0 0 0 | ||
APEX 2225039.53 -5441197.63 -2479303.36 4900 4900 1 1 0 0 0 0 0 | ||
JCMT -5464584.68 -2493001.17 2150653.98 10000 10000 1 0 0 0 0 0 0 | ||
APEX 2225039.53 -5441197.63 -2479303.36 4900 4900 1 1 0 0 0 0 0 | ||
JCMT -5464584.68 -2493001.17 2150653.98 10000 10000 1 0 0 0 0 0 0 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,13 @@ | ||
PDB 4523998.40 468045.240 4460309.760 1500 | ||
PV 5088967.9000 -301681.6000 3825015.8000 1400 | ||
SMT -1828796.200 -5054406.800 3427865.200 5000 | ||
SMA -5464523.400 -2493147.080 2150611.750 4900 | ||
LMT -768713.9637 -5988541.7982 2063275.9472 600 | ||
ALMA 2225061.164 -5440057.37 -2481681.15 90 | ||
SPT 0.01 0.01 -6359609.7 5000 | ||
APEX 2225039.53 -5441197.63 -2479303.36 3500 | ||
JCMT -5464584.68 -2493001.17 2150653.98 6000 | ||
CARMA -2397431.300 -4482018.900 3843524.500 10000 | ||
KP -1995678.840 -5037317.697 3357328.025 10000 | ||
GLT 1500692.0 -1191735.0 6066409.0 10000 | ||
HAY 1492420.4965 -4457272.10037 4296891.72893 2500 #Haystack | ||
PIKES -1292058.67099 -4807190.10901 3981241.60693 10000 #Pikes Peak, Colorado | ||
BAJA -2352576.31173 -4940331.41122 3271508.49374 10000 #National Astronomical Observatory (Mexico) | ||
GAM 5627251.83789 1632172.52014 2517405.60946 10000 #Gamsberg, Namibia | ||
KAUAI -5547583.15126 -2073328.69989 2367861.8559 10000 #Kaua'i, Hawaii | ||
KEN 5077092.35557 3868758.28852 -16691.393515 10000 #Mount Kenya | ||
BOL 2282100.27386 -5685901.71836 -1785763.38112 10000 #Chacaltaya Astrophysical Observatory, Bolivia | ||
VLT 1946473.62308 -5467592.1824 -2642703.01185 10000 #VLT, Chile | ||
DRAK 4850818.24138 2718443.00852 -3120751.59707 10000 #Drakensberg, South Africa | ||
#NAME X Y Z SEFDR SEFDL FR_PAR_ANGLE FR_ELEV_ANGLE FR_OFFSET[d] DR_RE DR_IM DL_RE DL_IM | ||
PDB 4523998.40 468045.240 4460309.760 1500 1500 0 0 0 0 0 0 0 | ||
PV 5088967.9000 -301681.6000 3825015.8000 1400 1400 1 -1 0 0 0 0 0 | ||
SMT -1828796.200 -5054406.800 3427865.200 5000 5000 1 1 0 0.012 0.106 -0.007 0.093 | ||
SMA -5464523.400 -2493147.080 2150611.750 4900 4900 1 -1 45 0.022 0.009 0.008 0.010 | ||
LMT -768713.9637 -5988541.7982 2063275.9472 600 600 1 -1 0 0 0 0 0 | ||
ALMA 2225061.164 -5440057.37 -2481681.15 90 90 1 0 0 0 0 0 0 | ||
SPT 0.01 0.01 -6359609.7 5000 5000 1 0 0 0 0 0 0 | ||
APEX 2225039.53 -5441197.63 -2479303.36 3500 3500 1 1 0 0 0 0 0 | ||
JCMT -5464584.68 -2493001.17 2150653.98 6000 6000 1 0 0 0 0 0 0 | ||
CARMA -2397431.300 -4482018.900 3843524.500 10000 10000 0 0 0 0 0 0 0 | ||
KP -1995678.840 -5037317.697 3357328.025 10000 10000 0 0 0 0 0 0 0 | ||
GLT 1500692.0 -1191735.0 6066409.0 10000 10000 0 0 0 0 0 0 0 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.