Skip to content
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

Jump to bottom

U/jchiang/simple faint interface #184

Merged
merged 28 commits into from
Nov 19, 2018
Merged

U/jchiang/simple faint interface #184

merged 28 commits into from
Nov 19, 2018

Conversation

jchiang87
Copy link
Collaborator

No description provided.

@cwwalter
Copy link
Member

I'm soft of confused bywhat is going one with this one...

Isn't turning on the interface in #181? This seems to have a bunch of stuff in the other PRs that (haven't?) been already merged?

@jchiang87
preserve backwards compatibility with galsim v1.6
dc91c50
@jchiang87
use better test for exiting fopen context
74c0bd9
@jchiang87
read in uniqueIds as strings; update tiny_instcat.txt with explicit s…
7299ad9 
…tring object id
@jchiang87
add unit test code for new InstCatTrimmer; delete unused GsObjectDict…
c3bb2a3 
… class
@jchiang87
filter out instance catalog entries with 'inf' as one of the fields
69c7d76
@jchiang87
disable checkpoint file deletion for Run2.0i
5569337
@jchiang87
add node_id to ckpt.sqlite3 filename
9d5636e
@jchiang87
only calculate which objects land on a chip for the requested chip
e9de2bb
@jchiang87
exclude drawn objects from checkpoint files when compiling per sensor…
4abe3dc 
… object lists
@jchiang87
gather and pass checkpoint files for excluding from object lists; add…
39df1c9 
… debug statements and suppress ErfaWarnings
@jchiang87
use eimage filename for flats
efa7b02
@jchiang87
enable debug level logging in InstCatTrimmer
e3436a6
@jchiang87
add debug statements; replace str.split with more efficient substring…
cb24615 
… test
@jchiang87
restore default read_config() call
69d99fd
@jchiang87
add docstring to sources_from_list
de40ddd
@jchiang87
rename InstCatTrimmer.drawn_objects to InstCatTrimmer.drawn_objects_dict
f1ace31
@jchiang87
control sorting by magnorm via config file entry
62a179a
@jchiang87
set sort_magnorm default to True
0d043ae
@jchiang87
also save unique set size memory
fca5b54
@jchiang87
reduce memory usage for chip-level downselection of objects
34c88ab
@jchiang87
add requested explanatory comment and docstring
9cd70b9
@jchiang87
remove objects not landing on chips for new chip downselection code
3e1e7eb
@jchiang87
account for re-ordering of gs_objects by new down-selction code
a0a91ee
@jchiang87
ensure that the gs_objects added to gs_object_arr are unique (using u…
bb60bd7 
…niqueId)
@jchiang87
add faint object drawing options to config file
f1a9b0b
@jchiang87
Copy link
Collaborator Author

Unfortunately, all of the stuff prior to Sept 13 was merged from the dc2_run20_rc branch, that's why there's commits that have been merged into master already. It's a mess, I know, but in the end it will be ok.

@cwwalter
Copy link
Member

OK but I'm just sort of confused... is there anything in here which is not in the other PRs like
#174, #176, #181 etc (that were merged to the branch)?

Can't you go back and merge those branches individually to master? Or is there some change in this one that isn't in the others (that's the part I am confused by...)?

@cwwalter
Copy link
Member

Oops forgot to type: Also wondering if this one has the commits we wanted to leave out in it?

@jchiang87 jchiang87 force-pushed the u/jchiang/simple_faint_interface branch from d3b0d15 to e15cad3 Compare November 15, 2018 05:06
@coveralls
Copy link

coveralls commented Nov 15, 2018 •
edited
Loading

Coverage Status

Coverage decreased (-0.03%) to 73.419% when pulling ea2b9d7 on u/jchiang/simple_faint_interface into 18b1da2 on master.

@jchiang87
Copy link
Collaborator Author

I'll merge this at 9am tomorrow PT unless I hear otherwise.

@jchiang87 jchiang87 merged commit 43dac6b into master Nov 19, 2018
@jchiang87 jchiang87 deleted the u/jchiang/simple_faint_interface branch November 19, 2018 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jchiang87 @cwwalter @coveralls