Some cleaning up, plus a change to the mask parameters.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@55 89daf98e-ef62-4674-b946-b8ff9de2216c

1 files changed, 23 insertions, 22 deletions

diff --git a/param.ccl b/param.ccl
index c822575..50df1e2 100644
--- a/param.ccl
+++ b/param.ccl
@@ -5,12 +5,19 @@
 #These parameters are to switch on the finder, and to control how
 #often and when to start looking for horizons.
 
-private:
+restricted:
 
 BOOLEAN ahf_active "Activate AHFinder?"
 {
 } "no"
 
+BOOLEAN ahf_persists "Does the AH Finder array and mask stay around"
+{
+} "no"
+
+
+private:
+
 BOOLEAN ahf_find3 "Searching for 3 surfaces?"
 {
 } "no"
@@ -362,48 +369,42 @@ BOOLEAN ahf_gaussout "Output gaussian curvature of horizon?"
 } "yes"
 
 
-
 #Parameters for mask.
-#IMPORTANT:  By default the mask is always off!
 
-BOOLEAN ahf_mask "Use mask for definite horizons?"
+KEYWORD ahf_mask "Use mask for definite horizons?"
 {
-} "no"
+"off"    :: "Mask is off"
+"strong" :: "Mask set only for definite horizons"
+"weak"   :: "Mask set for both definite and probable horizons"
+} "off"
 
-BOOLEAN ahf_weakmask "Use mask for possible horizons?"
+BOOLEAN ahf_maskcube "Do we want a cubical mask?"
 {
 } "no"
 
 REAL ahf_maskshrink "Shrink factor for mask"
 {
- : ::
-} -2.0
-
-BOOLEAN ahf_persists "Does the AH Finder array and mask stay around"
-{
-} "no"
+0.0:1.0 :: "Must be positive and not larger than 1"
+} 0.9
 
 
+####################################
+### PARAMETERS FROM OTHER THORNS ###
+####################################
 
+###  FROM IO  ###
 
-#############################################################################
-### import IOUtil parameters
-#############################################################################
 shares: IO
 
-####################
-# Output directories
-####################
 EXTENDS STRING outdir "Name of IO output directory"
 {
 } "."
 
-########################
-###  Get symmetries  ###
-########################
+###  FROM GRID  ###
 
 shares: grid
 
-EXTENDS KEYWORD domain ""
+KEYWORD domain ""
 {
 }
+