--- ray/src/rt/pmapopt.c	2015/02/24 19:39:27	2.1
+++ ray/src/rt/pmapopt.c	2015/08/18 18:45:55	2.6
@@ -1,21 +1,23 @@
+#ifndef lint
+static const char RCSid[] = "$Id: pmapopt.c,v 2.6 2015/08/18 18:45:55 greg Exp $";
+#endif
 /* 
    ==================================================================
    Photon map interface to RADIANCE render options
 
    Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
    (c) Fraunhofer Institute for Solar Energy Systems,
-       Lucerne University of Applied Sciences & Arts
+   (c) Lucerne University of Applied Sciences and Arts,
+   supported by the Swiss National Science Foundation (SNSF, #147053)
    ==================================================================   
    
-   $Id: pmapopt.c,v 2.1 2015/02/24 19:39:27 greg Exp $
+   $Id: pmapopt.c,v 2.6 2015/08/18 18:45:55 greg Exp $
 */
 
 
 
-#include <stdlib.h>
+#include "ray.h"
 #include "pmapparm.h"
-#include "rtio.h"
-#include "rterror.h"
 
 
 
@@ -34,6 +36,8 @@ int getPmapRenderOpt (int ac, char *av [])
       case 'a':
          switch (av [0][2]) {
             case 'p': /* photon map */
+	       /* Asking for photon map, ergo ambounce != 0 */
+	       ambounce += (ambounce == 0);
                if (!check(3, "s")) {
                   /* File -> assume bwidth = 1 or precomputed pmap */
                   if (++t >= NUM_PMAP_TYPES)
@@ -71,8 +75,8 @@ int getPmapRenderOpt (int ac, char *av [])
                }
                else return 2;
                
-            case 'm': /* max photon search radius coefficient */
-               if (check(3, "f") || (maxDistCoeff = atof(av [1])) <= 0)
+            case 'm': /* Fixed max photon search radius */
+               if (check(3, "f") || (maxDistFix = atof(av [1])) <= 0)
                   error(USER, "invalid max photon search radius coefficient");
 
                return 1;
@@ -89,6 +93,5 @@ int getPmapRenderOpt (int ac, char *av [])
 void printPmapDefaults ()
 /* Print defaults for photon map render options */
 {
-   puts("-ap file [bwidth1 [bwidth2]]\t# photon map");
-   printf("-am %.1f\t\t\t# max photon search radius coeff\n", maxDistCoeff);
+   printf("-am %.1f\t\t\t\t# max photon search radius\n", maxDistFix);
 }