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.

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

allow nondetections in photometry uploads #664

Merged
merged 2 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tom_dataproducts/data_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def run_data_processor(dp):
data = data_processor.process_data(dp)

reduced_datums = [ReducedDatum(target=dp.target, data_product=dp, data_type=dp.data_product_type,
timestamp=datum[0], value=datum[1]) for datum in data]
timestamp=datum[0], value=datum[1], source_name=datum[2]) for datum in data]
ReducedDatum.objects.bulk_create(reduced_datums)

return ReducedDatum.objects.filter(data_product=dp)
Expand Down
6 changes: 4 additions & 2 deletions tom_dataproducts/processors/photometry_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from astropy import units
from astropy.io import ascii
from astropy.time import Time, TimezoneInfo
import numpy as np

from tom_dataproducts.data_processor import DataProcessor
from tom_dataproducts.exceptions import InvalidFileFormatException
Expand All @@ -25,7 +26,7 @@ def process_data(self, data_product):
mimetype = mimetypes.guess_type(data_product.data.path)[0]
if mimetype in self.PLAINTEXT_MIMETYPES:
photometry = self._process_photometry_from_plaintext(data_product)
return [(datum.pop('timestamp'), datum) for datum in photometry]
return [(datum.pop('timestamp'), datum, datum.pop('source', '')) for datum in photometry]
else:
raise InvalidFileFormatException('Unsupported file type')

Expand Down Expand Up @@ -57,7 +58,8 @@ def _process_photometry_from_plaintext(self, data_product):
'timestamp': time.to_datetime(timezone=utc),
}
for column_name in datum.colnames:
value[column_name] = datum[column_name]
if not np.ma.is_masked(datum[column_name]):
value[column_name] = datum[column_name]
photometry.append(value)

return photometry
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
time,filter,magnitude,error
55959.06999999983,r,15.582,0.005
55959.06999999983,V,15.676,0.007
55959.06999999983,B,15.591,0.008
time,filter,magnitude,error,limit,source
55959.06999999983,r,15.582,0.005,,ZTF
55959.06999999983,V,15.676,0.007,,CSS
55959.06999999983,B,15.591,0.008,,Las Cumbres
55959.06999999983,B,,,18.0,DLT40