Changeset 33951 for branches/eam_branches/ipp-20120405/psModules/src/objects/pmSourceMoments.c

Timestamp:

May 29, 2012, 5:09:48 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSourceMoments.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/psModules/src/objects/pmSourceMoments.c

@@ -319 +319 @@
     }
 
-    source->moments->Mrf = RF/RS;
     source->moments->Mrh = RH/RS;
 
-    // if Mrf (first radial moment) is very small, we are getting into low-significance
+    // if Mrf = RF/RS (first radial moment) is very small, we are getting into low-significance
     // territory.  saturate at minKronRadius.  conversely, if Mrf is >> radius for faint
     // sources, we are clearly making an error.  saturate at radius.
-    float kronRefRadius = MAX(minKronRadius, source->moments->Mrf);
+    float kronRefRadius = MAX(minKronRadius, RF/RS);
     if (source->moments->SN < 10) {
         kronRefRadius = MIN(radius, kronRefRadius);
     }
+    source->moments->Mrf = kronRefRadius;
 
     // *** now calculate the kron flux values using the 1st radial moment