Skip to content

Commit 335480f

Browse files
astropenguinastropenguin
authored
#4 Merge pull request from b4r-dev/astropenguin/issue3
Update directory structure
2 parents 58747ae + 88eba74 commit 335480f

33 files changed

+232
-177
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": "observing-scripts",
3+
"image": "ubuntu:latest",
4+
"runArgs": [
5+
"--name=observing-scripts"
6+
],
7+
"onCreateCommand": "apt update",
8+
"postCreateCommand": "apt install -y git",
9+
"customizations": {
10+
"vscode": {
11+
"extensions": [
12+
"github.vscode-pull-request-github",
13+
"mhutchie.git-graph"
14+
],
15+
"settings": {
16+
"files.insertFinalNewline": true,
17+
"files.trimTrailingWhitespace": true
18+
}
19+
}
20+
}
21+
}

‎.github/workflows/tests.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
job:
13+
name: Build
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
- run: sh makeAll.sh

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
products/*
2+
!products/.gitkeep

‎README.md

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,56 @@
11
# observing-scripts
2-
Templates and makers of B4R observing scripts
2+
Templates and commands for making B4R observing scripts (*.scr)
3+
4+
## Usage
5+
6+
1. Update frequency settings in `catalog/`
7+
1. Update pointing/science lists in `catalog/`
8+
1. Run commands (`*.sh`) to create observing scripts
9+
10+
## Frequecy/source lists (`catalog/*.txt`; tab-separated)
11+
12+
Filename | Description
13+
--- | ---
14+
`B4R_frequency_settings.txt` | List of frequency settings
15+
`B4R_PointingCont_list.txt` | List of continuum sources for pointing
16+
`B4R_Science_list.txt` | List of science targets
17+
`B4R_SiOmaser_list.txt` | List of SiO maser sources for pointing
18+
`B4R_catalog.cat` | (Not used for script making)
19+
`B4R_point.cat` | (Not used for script making)
20+
21+
## Template observing scripts (`templates/*.scr`)
22+
23+
Filename | Description
24+
--- | ---
25+
`b4r_Astigmatism_3C84_cont02_v01.scr` | Observing script for astigmatism correction (cont mode)
26+
`b4r_Astigmatism_Ocet_spec02_v01.scr` | Observing script for astigmatism correction (spec mode)
27+
`b4r_Beammap_3C84_spec02_v01.scr` | Observing script for measuring beammap (spec mode)
28+
`b4r_FocusXY_3C84_cont02_v01.scr` | Observing script for X/Y focus corection (cont mode)
29+
`b4r_FocusZ_3C84_cont02_v01.scr` | Observing script for Z focus correction (cont mode)
30+
`b4r_FocusZ_OCet_spec02_v01.scr` | Observing script for Z focus correction (spec mode)
31+
`b4r_PointingCont_3C84_cont02_v01.scr` | Observing script for pointing correction (cont mode)
32+
`b4r_PointingLine_OCet_spec02_v01.scr` | Observing script for pointing correction (spec mode)
33+
`b4r_SciencePs_PJ020941.3_spec02_v01.scr` | Observing script for position switching (spec mode)
34+
`b4r_Astigmatism_OriKL_spec02_v01.scr` | (Not used in commands)
35+
`b4r_FocusZ_OriKL_spec02_v01.scr` | (Not used in commands)
36+
`b4r_PointingLine_OriKL_spec02_v01.scr` | (Not used in commands)
37+
`b4r_PointingLine_OriKL_spec02_v02.scr` | (Not used in commands)
38+
`b4r_PointingLine_OriKL_spec02_v03.scr` | (Not used in commands)
39+
`b4r_PointingLine_OriKL_spec02_v04.scr` | (Not used in commands)
40+
`b4r_SciencePs_Borisov_spec02_v01.scr` | (Not used in commands)
41+
`b4r_SciencePs_OriKL_spec02_v01.scr` | (Not used in commands)
42+
43+
## Commands
44+
45+
Command | Source catalog | Template observing script | Description
46+
--- | --- | --- | ---
47+
`makeAstigmatismCont.sh` | `B4R_PointingCont_list.txt` | `b4r_Astigmatism_3C84_cont02_v01.scr` | Make observing scripts for astigmatism correction (cont mode) with a combination of frequencies and continuum sources
48+
`makeAstigmatismSpec.sh` | `B4R_SiOmaser_list.txt` | `b4r_Astigmatism_Ocet_spec02_v01.scr` | Make observing scripts for astigmatism correction (spec mode) with a combination of frequencies and SiO maser sources
49+
`makeBeammap.sh` | `B4R_PointingCont_list.txt` | `b4r_Beammap_3C84_spec02_v01.scr` | Make observing scripts for measuring beammap (spec mode) with a combination of frequencies and continuum sources
50+
`makeFocusXY.sh` | `B4R_PointingCont_list.txt` | `b4r_FocusXY_3C84_cont02_v01.scr` | Make observing scripts for X/Y focus corection (cont mode) with a combination of frequencies and continuum sources
51+
`makeFocusZcont.sh` | `B4R_PointingCont_list.txt` | `b4r_FocusZ_3C84_cont02_v01.scr` | Make observing scripts for Z focus corection (cont mode) with a combination of frequencies and continuum sources
52+
`makeFocusZspec.sh` | `B4R_SiOmaser_list.txt` | `b4r_FocusZ_OCet_spec02_v01.scr` | Make observing scripts for Z focus corection (spec mode) with a combination of frequencies and SiO maser sources
53+
`makePointingCont.sh` | `B4R_PointingCont_list.txt` | `b4r_PointingCont_3C84_cont02_v01.scr` | Observing scripts for pointing correction (cont mode) with a combination of frequencies and continuum sources
54+
`makePointingLine.sh` | `B4R_SiOmaser_list.txt` | `b4r_PointingLine_OCet_spec02_v01.scr` | Observing scripts for pointing correction (spec mode) with a combination of frequencies and SiO maser sources
55+
`makeScinecePs.sh` | `B4R_Science_list.txt` | `b4r_SciencePs_PJ020941.3_spec02_vdd01.scr` | Observing scripts for position switching (spec mode) with a combination of frequencies and science targets
56+
`makeAllFreqIDs.sh <scr>` | - | `<scr>` | Make observing scripts from given observing script with changing frequencies

‎bin/makeAllFreqIDs.sh

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#!/bin/bash
2+
set -eu
23

34
file_freq_set='catalog/B4R_frequency_settings.txt'
45

56
for scr in $@; do
6-
original_freq_name=`printf ${scr} | awk ' BEGIN { FS="_";OFS="_" } { print $4 }'`
7-
make_dir="`basename $scr .scr`"_allFreqs
7+
original_freq_name=`echo ${scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }'`
8+
make_dir=products/`basename $scr .scr`_allFreqs
89
echo Make all freq setting for ${scr} in ${make_dir}.
9-
mkdir ${make_dir}
10-
chmod 770 ${make_dir}
10+
mkdir -p ${make_dir}
1111

12-
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
12+
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
1313
freqID2=`printf "%02d" $freqID`
1414
printf "makeing for freqID %s " $freqID2
1515
printf "line %.1f GHz " $line_freq
1616
printf "IF %.1f GHz\n" $IF_freq
17-
cont_or_spec=`printf $scr| awk 'BEGIN{FS="_";OFS="_"}{print $4}' | cut -c 1-4`
17+
cont_or_spec=`echo $scr | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }' | cut -c 1-4`
1818
cont_or_spec_freqID2=$cont_or_spec$freqID2
19-
#echo ${cont_or_spec_freqID2}
20-
new_scr=./${make_dir}/`printf $scr| awk 'BEGIN{FS="_";OFS="_"}{$4="'${cont_or_spec_freqID2}'"}{print $0}'`
21-
#echo $new_scr
19+
tmp_scr=`echo $scr | awk 'BEGIN { FS="_"; OFS="_" }{ $4="'${cont_or_spec_freqID2}'"; print $0 }'`
20+
tmp_scr=`basename $tmp_scr`
21+
new_scr=./${make_dir}/${tmp_scr}
2222

2323

2424
cat ${scr} | awk '
@@ -29,10 +29,4 @@ for scr in $@; do
2929
{ print $0 }
3030
' > $new_scr
3131
done
32-
33-
done
34-
35-
36-
37-
38-
32+
done

‎bin/makeAstigmatismCont.sh

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,38 @@
11
#!/bin/bash
2+
set -eu
23

34
file_freq_set='catalog/B4R_frequency_settings.txt'
45
file_Pointing_cont='catalog/B4R_PointingCont_list.txt'
5-
original_scr='b4r_Astigmatism_3C84_cont02_v01.scr'
6-
original_source_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $3 }'`
7-
original_freq_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $4 }'`
6+
original_scr='templates/b4r_Astigmatism_3C84_cont02_v01.scr'
7+
original_source_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $3 }'`
8+
original_freq_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }'`
89
datetime=`date -u`
910

10-
make_dir="`basename $original_scr .scr`"_all
11+
make_dir=products/`basename $original_scr .scr`_all
1112
echo Make all source and freq setting for ${original_scr} in ${make_dir}.
12-
mkdir ${make_dir}
13-
chmod 770 ${make_dir}
13+
mkdir -p ${make_dir}
1414

15-
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
15+
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
1616
if [ $ra != "Planet" ]; then
1717
planet="false"
1818
else
19-
echo $dec
19+
echo $dec
2020
ra="00:00:00.0"
2121
dec="00:00:00.0"
2222
planet="true"
2323
fi
24-
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
24+
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
2525
freqID2=`printf "%02d" $freqID`
2626
printf "making for %s: " $source
2727
printf "freqID %s: " $freqID2
2828
printf "line %.1f GHz: " $line_freq
2929
printf "IF %.1f GHz\n" $IF_freq
3030

31-
cont_or_spec=`printf ${original_scr} | awk 'BEGIN{FS="_";OFS="_"}{print $4}' | cut -c 1-4`
32-
#echo ${cont_or_spec}
31+
cont_or_spec=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }' | cut -c 1-4`
3332
cont_or_spec_freqID2=$cont_or_spec$freqID2
34-
#echo ${cont_or_spec_freqID2}
35-
tmp_scr=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { $4="'${cont_or_spec_freqID2}'" } { $3="'${source}'" } END { print $0 } '`
36-
#echo ${tmp_scr}
33+
tmp_scr=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { $4="'${cont_or_spec_freqID2}'"; $3="'${source}'"; print $0 }'`
34+
tmp_scr=`basename $tmp_scr`
3735
new_scr=./${make_dir}/${tmp_scr}
38-
#echo $new_scr
3936

4037
cat ${original_scr} | awk '
4138
{ for(i=1;i<=NF;i++) { if($i=="-If2Freq[0]") {$(i+1)="'${IF_freq}'"} } }
@@ -51,7 +48,5 @@ cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
5148
{ print $0 }
5249
' > $new_scr
5350

54-
done
55-
done
56-
57-
51+
done
52+
done

‎bin/makeAstigmatismSpec.sh

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
#!/bin/bash
2+
set -eu
23

34
file_freq_set='catalog/B4R_frequency_settings.txt'
45
file_Pointing_line='catalog/B4R_SiOmaser_list.txt'
5-
original_scr='b4r_Astigmatism_Ocet_spec02_v01.scr'
6-
original_source_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $3 }'`
6+
original_scr='templates/b4r_Astigmatism_Ocet_spec02_v01.scr'
7+
original_source_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $3 }'`
78

8-
make_dir="`basename $original_scr .scr`"_all
9+
make_dir=products/`basename $original_scr .scr`_all
910
echo Make all sources for ${original_scr} in ${make_dir}.
10-
mkdir ${make_dir}
11-
chmod 770 ${make_dir}
11+
mkdir -p ${make_dir}
1212

13-
cat $file_Pointing_line | grep -v '^#.*' | while read source ra dec comments; do
14-
tmp_scr=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { $3="'${source}'" } END { print $0 } '`
15-
#echo ${tmp_scr}
13+
cat $file_Pointing_line | grep -v '^#.*' | while read source ra dec comments; do
14+
tmp_scr=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { $3="'${source}'"; print $0 }'`
15+
tmp_scr=`basename $tmp_scr`
1616
new_scr=./${make_dir}/${tmp_scr}
17-
#echo $new_scr
1817
echo "Make $tmp_scr."
1918

2019
cat ${original_scr} | awk '
@@ -26,5 +25,4 @@ cat $file_Pointing_line | grep -v '^#.*' | while read source ra dec comments; do
2625
{ print $0 }
2726
' > $new_scr
2827

29-
done
30-
28+
done

‎bin/makeBeammap.sh

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,38 @@
11
#!/bin/bash
2+
set -eu
23

34
file_freq_set='catalog/B4R_frequency_settings.txt'
45
file_Pointing_cont='catalog/B4R_PointingCont_list.txt'
5-
original_scr='b4r_Beammap_3C84_spec02_v01.scr'
6-
original_source_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $3 }'`
7-
original_freq_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $4 }'`
6+
original_scr='templates/b4r_Beammap_3C84_spec02_v01.scr'
7+
original_source_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $3 }'`
8+
original_freq_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }'`
89
datetime=`date -u`
910

10-
make_dir="`basename $original_scr .scr`"_all
11+
make_dir=products/`basename $original_scr .scr`_all
1112
echo Make all source and freq setting for ${original_scr} in ${make_dir}.
12-
mkdir ${make_dir}
13-
chmod 770 ${make_dir}
13+
mkdir -p ${make_dir}
1414

15-
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
15+
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
1616
if [ $ra != "Planet" ]; then
1717
planet="false"
1818
else
19-
echo $dec
19+
echo $dec
2020
ra="00:00:00.0"
2121
dec="00:00:00.0"
2222
planet="true"
2323
fi
24-
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
24+
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
2525
freqID2=`printf "%02d" $freqID`
2626
printf "making for %s: " $source
2727
printf "freqID %s: " $freqID2
2828
printf "line %.1f GHz: " $line_freq
2929
printf "IF %.1f GHz\n" $IF_freq
3030

31-
cont_or_spec=`printf ${original_scr} | awk 'BEGIN{FS="_";OFS="_"}{print $4}' | cut -c 1-4`
32-
#echo ${cont_or_spec}
31+
cont_or_spec=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }' | cut -c 1-4`
3332
cont_or_spec_freqID2=$cont_or_spec$freqID2
34-
#echo ${cont_or_spec_freqID2}
35-
tmp_scr=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { $4="'${cont_or_spec_freqID2}'" } { $3="'${source}'" } END { print $0 } '`
36-
#echo ${tmp_scr}
33+
tmp_scr=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { $4="'${cont_or_spec_freqID2}'"; $3="'${source}'"; print $0 }'`
34+
tmp_scr=`basename $tmp_scr`
3735
new_scr=./${make_dir}/${tmp_scr}
38-
#echo $new_scr
3936

4037
cat ${original_scr} | awk '
4138
{ for(i=1;i<=NF;i++) { if($i=="-If2Freq[0]") {$(i+1)="'${IF_freq}'"} } }
@@ -51,7 +48,5 @@ cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
5148
{ print $0 }
5249
' > $new_scr
5350

54-
done
55-
done
56-
57-
51+
done
52+
done

‎bin/makeFocusXY.sh

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,38 @@
11
#!/bin/bash
2+
set -eu
23

34
file_freq_set='catalog/B4R_frequency_settings.txt'
45
file_Pointing_cont='catalog/B4R_PointingCont_list.txt'
5-
original_scr='b4r_FocusXY_3C84_cont02_v01.scr'
6-
original_source_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $3 }'`
7-
original_freq_name=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { print $4 }'`
6+
original_scr='templates/b4r_FocusXY_3C84_cont02_v01.scr'
7+
original_source_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $3 }'`
8+
original_freq_name=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }'`
89
datetime=`date -u`
910

10-
make_dir="`basename $original_scr .scr`"_all
11+
make_dir=products/`basename $original_scr .scr`_all
1112
echo Make all source and freq setting for ${original_scr} in ${make_dir}.
12-
mkdir ${make_dir}
13-
chmod 770 ${make_dir}
13+
mkdir -p ${make_dir}
1414

15-
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
15+
cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
1616
if [ $ra != "Planet" ]; then
1717
planet="false"
1818
else
19-
echo $dec
19+
echo $dec
2020
ra="00:00:00.0"
2121
dec="00:00:00.0"
2222
planet="true"
2323
fi
24-
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
24+
cat $file_freq_set | grep -v '^#.*' | while read freqID line_freq IF_freq comments; do
2525
freqID2=`printf "%02d" $freqID`
2626
printf "making for %s: " $source
2727
printf "freqID %s: " $freqID2
2828
printf "line %.1f GHz: " $line_freq
2929
printf "IF %.1f GHz\n" $IF_freq
3030

31-
cont_or_spec=`printf ${original_scr} | awk 'BEGIN{FS="_";OFS="_"}{print $4}' | cut -c 1-4`
32-
#echo ${cont_or_spec}
31+
cont_or_spec=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { print $4 }' | cut -c 1-4`
3332
cont_or_spec_freqID2=$cont_or_spec$freqID2
34-
#echo ${cont_or_spec_freqID2}
35-
tmp_scr=`printf ${original_scr} | awk ' BEGIN { FS="_";OFS="_" } { $4="'${cont_or_spec_freqID2}'" } { $3="'${source}'" } END { print $0 } '`
36-
#echo ${tmp_scr}
33+
tmp_scr=`echo ${original_scr} | awk 'BEGIN { FS="_"; OFS="_" } { $4="'${cont_or_spec_freqID2}'"; $3="'${source}'"; print $0 }'`
34+
tmp_scr=`basename $tmp_scr`
3735
new_scr=./${make_dir}/${tmp_scr}
38-
#echo $new_scr
3936

4037
cat ${original_scr} | awk '
4138
{ for(i=1;i<=NF;i++) { if($i=="-If2Freq[0]") {$(i+1)="'${IF_freq}'"} } }
@@ -51,6 +48,5 @@ cat $file_Pointing_cont | grep -v '^#.*' | while read source ra dec comments; do
5148
{ print $0 }
5249
' > $new_scr
5350

54-
done
55-
done
56-
51+
done
52+
done

0 commit comments

Comments
 (0)