Changeset 35551 for branches/eam_branches/ipp-20130419/psModules/src/camera/pmReadoutFake.c

Timestamp:

May 9, 2013, 11:32:28 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmReadoutFake.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/psModules/src/camera/pmReadoutFake.c

@@ -152 +152 @@
             return false;
         }
-
+        
         psTrace("psModules.camera", 10, "Adding source at %f,%f with flux %f\n",
                 fakeModel->params->data.F32[PM_PAR_XPOS], fakeModel->params->data.F32[PM_PAR_YPOS],