Changeset 34041 for branches/meh_branches/ppstack_test/ppMerge/src/ppMergeLoop.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeLoop.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ppMerge/src/ppMergeLoop.c

@@ -125 +125 @@
       case PPMERGE_TYPE_DARK:
       case PPMERGE_TYPE_CTEMASK:
+      case PPMERGE_TYPE_NOISEMAP:
         break;
       default:
@@ -280 +281 @@
               case PPMERGE_TYPE_FLAT:
               case PPMERGE_TYPE_FRINGE:
+              case PPMERGE_TYPE_NOISEMAP:
                 psAssert (fileGroups->n > 0, "no valid file groups defined");
                 fileGroup = fileGroups->data[0];
@@ -324 +326 @@
                   case PPMERGE_TYPE_BIAS:
                   case PPMERGE_TYPE_FLAT:
+                  case PPMERGE_TYPE_NOISEMAP:
                   case PPMERGE_TYPE_FRINGE: {
                       psThreadJob *job = psThreadJobAlloc("PPMERGE_READOUT_COMBINE"); ///< Job to start