Changeset 36324

Timestamp:

Nov 28, 2013, 1:22:58 PM (13 years ago)

Author:

eugene

Message:

extended sersic valid index range to 8.0; interactive printout pmPCM_Min

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

• models/pmModel_SERSIC.c (modified) (1 diff)
• pmPCM_MinimizeChisq.c (modified) (3 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/models/pmModel_SERSIC.c

@@ -75 +75 @@
 
 // Lax parameter limits
-static float paramsMinLax[] = { -1.0e3, 1.0e-2, -100, -100, 0.001, 0.001, -1.0, 0.1 };
+static float paramsMinLax[] = { -1.0e3, 1.0e-2, -100, -100, 0.001, 0.001, -1.0, 0.0625 };
 static float paramsMaxLax[] = { 1.0e5, 1.0e9, 1.0e5, 1.0e5, 100, 100, 1.0, 1.0 };
 

branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -135 +135 @@
         }
 
-        if (1) {
+        if (min->isInteractive) {
             fprintf (stderr, "%d : ", min->iter);
             for (int ti = 0; ti < params->n; ti++) {
@@ -148 +148 @@
         // set a new guess for Alpha, Beta, Params
         if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda, &dLinear)) {
-            if (min->isInteractive) {
+            if (false && min->isInteractive) {
                 fprintf (stdout, "guess failed (singular matrix or NaN values), continue? [Y,n] ");
                 if (!fgets(key, 8, stdin)) {
@@ -175 +175 @@
         }
 
-        if (min->isInteractive) {
+        if (false && min->isInteractive) {
             p_psVectorPrint(psTraceGetDestination(), Params, "current parameters: ");
             fprintf (stdout, "last chisq : %f\n", min->value);