Changeset 34362 for trunk/psModules

Timestamp:

Aug 28, 2012, 2:44:34 PM (14 years ago)

Author:

bills

Message:

when reading cmf file set source->nFrames

File:

• trunk/psModules/src/objects/pmSourceIO_CMF.c.in (modified) (2 diffs)

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -199 +199 @@
         @ALL@                     psMetadataAdd (row, PS_LIST_TAIL, "FLAGS",            PS_DATA_U32, "psphot analysis flags",                      source->mode);
         @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "FLAGS2",           PS_DATA_U32, "psphot analysis flags",                      source->mode2);
+        // @>PS1_V2,PS1_SV1,PS1_DV2@ psMetadataAdd (row, PS_LIST_TAIL, "FLAGS2",           PS_DATA_U32, "psphot analysis flags",                      source->mode2 | (source->id<<8));
         @>PS1_V2@                 psMetadataAdd (row, PS_LIST_TAIL, "PADDING2",         PS_DATA_S32, "more padding", 0);
         @PS1_SV1@
@@ -398 +399 @@
         @PS1_DV?@  }
 
-        @ALL@                     source->mode  = psMetadataLookupU32 (&status, row, "FLAGS");
-        @>PS1_V2,PS1_SV1,PS1_DV2@ source->mode2 = psMetadataLookupU32 (&status, row, "FLAGS2");
+        @ALL@                     source->mode       = psMetadataLookupU32 (&status, row, "FLAGS");
+        @>PS1_V2,PS1_SV1,PS1_DV2@ source->mode2      = psMetadataLookupU32 (&status, row, "FLAGS2");
+        @ALL@                     source->nFrames    = psMetadataLookupU16 (&status, row, "N_FRAMES");
         assert (status);