Mask fixes

editeodoro · Sep 26, 2015 · e6f09db · e6f09db
1 parent 70f99b1
commit e6f09db
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/Arrays/param.cpp b/src/Arrays/param.cpp
@@ -579,6 +579,18 @@ bool Param::checkPars() {
 				good = false;
             }
 		}
+
+        if (NORM!="NONE" && NORM!="AZIM" && NORM!="LOCAL") {
+            std::cout << " ERROR: Unknown type of normalization: " << NORM << std::endl;
+            std::cout << "Setting to LOCAL" << std::endl;
+            NORM="LOCAL";
+        }
+
+        if (MASK!="NONE" && MASK!="SMOOTH" && MASK!="SEARCH" && MASK!="THRESHOLD" && MASK!="NEGATIVE") {
+            std::cout << " ERROR: Unknown type of mask: " << MASK << std::endl;
+            std::cout << "Setting to SMOOTH" << std::endl;
+            MASK="SMOOTH";
+        }
 
         if (flagGalFit) {
             if (FREE=="") {
@@ -652,17 +664,7 @@ bool Param::checkPars() {
         checkHome(ivarfile);
     }
 
-    if (NORM!="NONE" && NORM!="AZIM" && NORM!="LOCAL") {
-        std::cout << " ERROR: Unknown type of normalization: " << NORM << std::endl;
-        std::cout << "Setting to LOCAL" << std::endl;
-        NORM="LOCAL";
-    }
 
-    if (!(MASK=="NONE" || MASK=="SMOOTH" || MASK=="SEARCH" || MASK=="THRESHOLD" || MASK=="NEGATIVE")) {
-        std::cout << " ERROR: Unknown type of mask: " << MASK << std::endl;
-        std::cout << "Setting to SMOOTH" << std::endl;
-        MASK="SMOOTH";
-    }
 
 	return true;
 }

diff --git a/src/Utilities/galfit.cpp b/src/Utilities/galfit.cpp
@@ -1141,7 +1141,7 @@ void Galfit<T>::createMask() {
     Cube<short> *m = new Cube<short>;
     m->saveHead(in->Head());
  	m->saveParam(in->pars());
-    m->Head().setMinMax(0.,1.);
+    m->Head().setMinMax(0.,0);
  	m->setCube(mask, in->AxisDim());
 	std::string outname = in->pars().getOutfolder()+"mask.fits";
     m->fitswrite_3d(outname.c_str());