Changeset 18862 for trunk/ppMerge/src/ppMergeSetThreads.c

Timestamp:

Aug 1, 2008, 1:59:36 PM (18 years ago)

Author:

eugene

Message:

adding threaded code for DARK and SHUTTER

File:

• trunk/ppMerge/src/ppMergeSetThreads.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeSetThreads.c

@@ -21 +21 @@
     pmCell *outCell             = job->args->data[0];
     ppMergeFileGroup *fileGroup = job->args->data[1];
-    psArray *darkOrdinates      = job->args->data[2];
-    psString darkNorm           = job->args->data[3];
-    psScalar *iter              = job->args->data[4];
-    psScalar *rej               = job->args->data[5];
-    psScalar *maskVal           = job->args->data[6];
+    psScalar *iter              = job->args->data[2];
+    psScalar *rej               = job->args->data[3];
+    psScalar *maskVal           = job->args->data[4];
 
-    bool status = pmDarkCombine(outCell, fileGroup->readouts, darkOrdinates, darkNorm, iter->data.S32, rej->data.F32, maskVal->data.U8);
+    bool status = pmDarkCombine(outCell, fileGroup->readouts, iter->data.S32, rej->data.F32, maskVal->data.U8);
 
     // after we are done, tell the I/O system that this file group is done
@@ -34 +32 @@
 }
 
-bool ppMergeThread_pmShuttderCorrectionGenerate (psThreadJob *job) {
+bool ppMergeThread_pmShutterCorrectionGenerate (psThreadJob *job) {
 
     pmReadout *output             = job->args->data[0];
-    ppMergeFileGroup *fileGroup   = job->args->data[1];
-    psScalar *shutterRef          = job->args->data[2];
-    pmShutterCorrectionData *data = job->args->data[3];
-    psScalar *iter                = job->args->data[4];
-    psScalar *rej                 = job->args->data[5];
-    psScalar *maskVal             = job->args->data[6];
+    pmReadout *pattern            = job->args->data[1];
+    ppMergeFileGroup *fileGroup   = job->args->data[2];
+    psScalar *shutterRef          = job->args->data[3];
+    pmShutterCorrectionData *data = job->args->data[4];
+    psScalar *iter                = job->args->data[5];
+    psScalar *rej                 = job->args->data[6];
+    psScalar *maskVal             = job->args->data[7];
 
-    bool status = pmShutterCorrectionGenerate(output, NULL, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.U8);
+    bool status = pmShutterCorrectionGenerate(output, pattern, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.U8);
 
     // after we are done, tell the I/O system that this file group is done
@@ -59 +58 @@
     psThreadTaskAdd (task);
 
-    task = psThreadTaskAlloc ("PPMERGE_DARK_COMBINE", 7);
-    task->function = &ppMergeThread_pmReadoutCombine;
+    task = psThreadTaskAlloc ("PPMERGE_DARK_COMBINE", 5);
+    task->function = &ppMergeThread_pmDarkCombine;
     psThreadTaskAdd (task);
 
-    task = psThreadTaskAlloc ("PPMERGE_SHUTTER_CORRECTION", 7);
-    task->function = &ppMergeThread_pmReadoutCombine;
+    task = psThreadTaskAlloc ("PPMERGE_SHUTTER_CORRECTION", 8);
+    task->function = &ppMergeThread_pmShutterCorrectionGenerate;
     psThreadTaskAdd (task);