Skip to content

Commit 13d9103

Browse files
committed
update code to use FullDescription
1 parent 8693556 commit 13d9103

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

py/desidatamodel/stub.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ def read_column_descriptions(filename):
701701
"""Read column descriptions csv file and return dictionary
702702
703703
Args:
704-
filename (str): csv filename with columns NAME,TYPE,UNITS,DESCRIPTION
704+
filename (str): csv filename with columns NAME,TYPE,UNITS,DESCRIPTION,FULLDESCRIPTION
705705
706706
Returns:
707707
coldesc_dict[NAME] = dict with keys TYPE, UNITS, DESCRIPTION
@@ -713,15 +713,15 @@ def read_column_descriptions(filename):
713713

714714
with open(filename) as fp:
715715
header = fp.readline().strip()
716-
correct_header = 'Name,Type,Units,FullDescription,Description'
716+
correct_header = 'Name,Type,Units,Description,FullDescription'
717717
if header != correct_header:
718718
raise ValueError(f'{filename} header {header} should be {correct_header}.')
719719

720720
coldesc = dict()
721721
csvreader = csv.reader(fp)
722722
for row in csvreader:
723-
name, dtype, units, dm_desc, fits_desc = row
724-
coldesc[name] = dict(Type=dtype, Units=units, Description=dm_desc)
723+
name, dtype, units, short_desc, full_desc = row
724+
coldesc[name] = dict(Type=dtype, Units=units, Description=full_desc)
725725

726726
return coldesc
727727

@@ -754,7 +754,7 @@ def main():
754754
parser.add_argument('filename', help='A FITS file.', metavar='FILE',
755755
nargs='+')
756756
parser.add_argument("--column_descriptions",
757-
help="CSV file with column info Name,Type,Units,Description; "
757+
help="CSV file with column info Name,Type,Units,Description,FullDescription; "
758758
"default=%(default)s",
759759
default=(ir.files('desidatamodel') / 'data' / 'column_descriptions.csv'))
760760

0 commit comments

Comments
 (0)