price@pap-laptop:~/hsc/meas_extensions_psfex (master=) $ git rebase -p --onto master f76c79a lsst/master
|
Successfully rebased and updated detached HEAD.
|
price@pap-laptop:~/hsc/meas_extensions_psfex ((423c6dd...)) $ git co master
|
Warning: you are leaving 2 commits behind, not connected to
|
any of your branches:
|
|
423c6dd Merge branch 'tickets/DM-9810'
|
9b2b692 Add config parameter for BASIS_TYPE
|
|
If you want to keep them by creating a new branch, this may be a good time
|
to do so with:
|
|
git branch <new-branch-name> 423c6dd
|
|
Switched to branch 'master'
|
Your branch is up-to-date with 'origin/master'.
|
price@pap-laptop:~/hsc/meas_extensions_psfex (master=) $ git merge 423c6dd
|
Updating 1b4ab0c..423c6dd
|
Fast-forward
|
python/lsst/meas/extensions/psfex/psfexPsfDeterminer.py | 13 +++++++++++++
|
1 file changed, 13 insertions(+)
|
price@pap-laptop:~/hsc/meas_extensions_psfex (master>) $ git out
|
commit 423c6dd4409b74f58f625e99ccea30baf5033800
|
Merge: 1b4ab0c 9b2b692
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Tue Mar 21 15:38:24 2017 -0400
|
|
Merge branch 'tickets/DM-9810'
|
|
commit 9b2b69271208aaddd3a1aaeb77066c6fac4fecdc
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Fri Mar 17 13:05:18 2017 -0400
|
|
Add config parameter for BASIS_TYPE
|
price@pap-laptop:~/hsc/meas_extensions_psfex (master>) $ git push
|
Counting objects: 9, done.
|
Delta compression using up to 8 threads.
|
Compressing objects: 100% (8/8), done.
|
Writing objects: 100% (9/9), 1.05 KiB | 0 bytes/s, done.
|
Total 9 (delta 4), reused 0 (delta 0)
|
remote: Resolving deltas: 100% (4/4), completed with 3 local objects.
|
To github.com:HyperSuprime-Cam/meas_extensions_psfex.git
|
1b4ab0c..423c6dd master -> master
|
|
|
|
price@pap-laptop:~/hsc/obs_subaru (master=) $ git rebase -p --onto master 60c4f2d lsst/master
|
Successfully rebased and updated detached HEAD.
|
price@pap-laptop:~/hsc/obs_subaru ((3ec4d6f1...)) $ git co master
|
Warning: you are leaving 2 commits behind, not connected to
|
any of your branches:
|
|
3ec4d6f1 Merge branch 'tickets/DM-9810'
|
ee7cef3f Change psfex oversampling options.
|
|
If you want to keep them by creating a new branch, this may be a good time
|
to do so with:
|
|
git branch <new-branch-name> 3ec4d6f1
|
|
Switched to branch 'master'
|
Your branch is up-to-date with 'origin/master'.
|
price@pap-laptop:~/hsc/obs_subaru (master=) $ git merge 3ec4d6f1
|
Updating ddceaac6..3ec4d6f1
|
Fast-forward
|
config/processCcd.py | 3 +++
|
1 file changed, 3 insertions(+)
|
price@pap-laptop:~/hsc/obs_subaru (master>) $ git out
|
commit 3ec4d6f12002a8396fa636398d5920e0bf56511e
|
Merge: ddceaac6 ee7cef3f
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Tue Mar 21 15:42:08 2017 -0400
|
|
Merge branch 'tickets/DM-9810'
|
|
commit ee7cef3ff06583f094a897451d9e6f157f1bc164
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Tue Mar 21 12:42:32 2017 -0400
|
|
Change psfex oversampling options.
|
|
This commit forces psfex to use the native pixel basis
|
if the FWHM > 3 pixels. Otherwise, it will 2x oversample the
|
PSF model.
|
price@pap-laptop:~/hsc/obs_subaru (master>) $ git push
|
Counting objects: 5, done.
|
Delta compression using up to 8 threads.
|
Compressing objects: 100% (5/5), done.
|
Writing objects: 100% (5/5), 661 bytes | 0 bytes/s, done.
|
Total 5 (delta 4), reused 0 (delta 0)
|
remote: Resolving deltas: 100% (4/4), completed with 3 local objects.
|
To github.com:HyperSuprime-Cam/obs_subaru.git
|
ddceaac6..3ec4d6f1 master -> master
|
|
|
|
price@pap-laptop:~/hsc/meas_deblender (master=) $ git rebase -p --onto master e6413fc lsst/master
|
Successfully rebased and updated detached HEAD.
|
price@pap-laptop:~/hsc/meas_deblender ((dadfd13...)) $ git co master
|
Warning: you are leaving 2 commits behind, not connected to
|
any of your branches:
|
|
dadfd13 Merge branch 'tickets/DM-9856'
|
042d331 Add medianSmoothTemplate as config parameter
|
|
If you want to keep them by creating a new branch, this may be a good time
|
to do so with:
|
|
git branch <new-branch-name> dadfd13
|
|
Switched to branch 'master'
|
Your branch is up-to-date with 'origin/master'.
|
price@pap-laptop:~/hsc/meas_deblender (master=) $ git merge dadfd13
|
Updating fd75620..dadfd13
|
Fast-forward
|
python/lsst/meas/deblender/deblend.py | 5 ++++-
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
price@pap-laptop:~/hsc/meas_deblender (master>) $ git out
|
commit dadfd1301d4505e3d505e6cf0a5034402a9dfabb
|
Merge: fd75620 042d331
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Tue Mar 21 15:37:14 2017 -0400
|
|
Merge branch 'tickets/DM-9856'
|
|
commit 042d33132eaabeb9e597c994a4af21396c79983c
|
Author: Bob Armstrong <rearmstr@gmail.com>
|
Date: Fri Mar 17 13:06:15 2017 -0400
|
|
Add medianSmoothTemplate as config parameter
|
price@pap-laptop:~/hsc/meas_deblender (master>) $ git push
|
Counting objects: 8, done.
|
Delta compression using up to 8 threads.
|
Compressing objects: 100% (7/7), done.
|
Writing objects: 100% (8/8), 836 bytes | 0 bytes/s, done.
|
Total 8 (delta 4), reused 0 (delta 0)
|
remote: Resolving deltas: 100% (4/4), completed with 3 local objects.
|
To github.com:HyperSuprime-Cam/meas_deblender.git
|
fd75620..dadfd13 master -> master
|
DM-9438done:price@pap-laptop:~/hsc/obs_subaru (master=) $ git rebase --onto master e98f607 lsst/master
First, rewinding head to replay your work on top of it...
Applying: config: use PS1 reference catalog in LSST format
price@pap-laptop:~/hsc/obs_subaru ((ddceaac6...)) $ git co master
Warning: you are leaving 1 commit behind, not connected to
any of your branches:
ddceaac6 config: use PS1 reference catalog in LSST format
If you want to keep it by creating a new branch, this may be a good time
to do so with:
git branch <new-branch-name> ddceaac6
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
price@pap-laptop:~/hsc/obs_subaru (master=) $ git merge ddceaac6
Updating e09d034b..ddceaac6
Fast-forward
config/Mosaic.py | 13 ++++---------
config/measureCoaddSources.py | 4 +++-
config/processCcd.py | 14 ++++----------
3 files changed, 11 insertions(+), 20 deletions(-)
price@pap-laptop:~/hsc/obs_subaru (master>) $ git out
commit ddceaac6341899e2a1ee6c30cc02ca031617e08d
Author: Paul Price <price@astro.princeton.edu>
Date: Mon Mar 20 13:55:30 2017 -0400
config: use PS1 reference catalog in LSST format
This frees us from dependency on astrometry_net, and removes our reliance
on eups for setting the configuration.
price@pap-laptop:~/hsc/obs_subaru (master>) $ git push
Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 961 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5), completed with 4 local objects.
To github.com:HyperSuprime-Cam/obs_subaru.git
e09d034b..ddceaac6 master -> master