new mask

4 files changed, 251 insertions, 85 deletions

diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index 70c2834..fbc50a5 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -782,17 +782,17 @@ public:
   void hasFitsCubeCmd();
   void hasFitsMosaicCmd();
 
-  void loadFitsAllocCmd(const char*, const char*, LayerType);
-  void loadFitsAllocGZCmd(const char*, const char*, LayerType);
-  void loadFitsChannelCmd(const char*, const char*, LayerType);
-  void loadFitsMMapCmd(const char*, LayerType);
-  void loadFitsSMMapCmd(const char*, const char*, LayerType);
+  virtual void loadFitsAllocCmd(const char*, const char*, LayerType);
+  virtual void loadFitsAllocGZCmd(const char*, const char*, LayerType);
+  virtual void loadFitsChannelCmd(const char*, const char*, LayerType);
+  virtual void loadFitsMMapCmd(const char*, LayerType);
+  virtual void loadFitsSMMapCmd(const char*, const char*, LayerType);
   virtual void loadFitsMMapIncrCmd(const char*, LayerType);
-  void loadFitsShareCmd(ShmType, int, const char*, LayerType);
-  void loadFitsSShareCmd(ShmType, int, int, const char*, LayerType);
-  void loadFitsSocketCmd(int, const char*, LayerType);
-  void loadFitsSocketGZCmd(int, const char*, LayerType);
-  void loadFitsVarCmd(const char*, const char*, LayerType);
+  virtual void loadFitsShareCmd(ShmType, int, const char*, LayerType);
+  virtual void loadFitsSShareCmd(ShmType, int, int, const char*, LayerType);
+  virtual void loadFitsSocketCmd(int, const char*, LayerType);
+  virtual void loadFitsSocketGZCmd(int, const char*, LayerType);
+  virtual void loadFitsVarCmd(const char*, const char*, LayerType);
 
   void loadArrAllocCmd(const char*, const char*, LayerType);
   void loadArrAllocGZCmd(const char*, const char*, LayerType);
diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C
index d60a032..7d1e5a7 100644
--- a/tksao/frame/frame.C
+++ b/tksao/frame/frame.C
@@ -797,6 +797,89 @@ void Frame::savePhotoCmd(const char* ph)
 
 // load
 
+void Frame::loadFitsAllocCmd(const char* ch, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsAllocCmd(ch, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsAlloc(cc, interp, 
+					    ch, fn, FitsFile::NOFLUSH, 1);
+    loadDone(cc->load(ALLOC, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsAllocGZCmd(const char* ch, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsAllocGZCmd(ch, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsAllocGZ(cc, interp, 
+					      ch, fn, FitsFile::NOFLUSH, 1);
+    loadDone(cc->load(ALLOCGZ, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsChannelCmd(const char* ch, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsChannelCmd(ch, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsChannel(cc, interp, 
+					      ch, fn, FitsFile::NOFLUSH, 1);
+    loadDone(cc->load(CHANNEL, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsMMapCmd(const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsMMapCmd(fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsMMap(cc, interp, fn, 1);
+    loadDone(cc->load(MMAP, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsSMMapCmd(const char* hdr, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsSMMapCmd(hdr, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsSMMap(cc, interp, hdr, fn, 1);
+    loadDone(cc->load(SMMAP, fn, img));
+    break;
+  }
+}
+
 void Frame::loadFitsMMapIncrCmd(const char* fn, LayerType ll)
 {
   switch (ll) {
@@ -806,8 +889,95 @@ void Frame::loadFitsMMapIncrCmd(const char* fn, LayerType ll)
   case MASK:
     FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
     mask.append(msk);
-    FitsImage* img = new FitsImageFitsMMapIncr(msk->context(), interp, fn, 1);
-    loadDone(msk->context()->load(MMAPINCR, fn, img));
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsMMapIncr(cc, interp, fn, 1);
+    loadDone(cc->load(MMAPINCR, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsShareCmd(ShmType stype, int id, const char* fn,
+			     LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsShareCmd(stype, id, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsShare(cc, interp,
+					    stype, id, fn, 1);
+    loadDone(cc->load(SHARE, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsSShareCmd(ShmType stype, int hdr, int id, const char* fn,
+			      LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsSShareCmd(stype, hdr, id, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsSShare(cc, interp, 
+					     stype, hdr, id, fn, 1);
+    loadDone(cc->load(SSHARE, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsSocketCmd(int s, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsSocketCmd(s, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsSocket(cc, interp, 
+					     s, fn, FitsFile::FLUSH, 1);
+    loadDone(cc->load(SOCKET, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsSocketGZCmd(int s, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsSocketGZCmd(s, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsSocketGZ(cc, interp, 
+					       s, fn, FitsFile::FLUSH, 1);
+    loadDone(cc->load(SOCKETGZ, fn, img));
+    break;
+  }
+}
+
+void Frame::loadFitsVarCmd(const char* ch, const char* fn, LayerType ll)
+{
+  switch (ll) {
+  case IMG:
+    Base::loadFitsVarCmd(ch, fn, ll);
+    break;
+  case MASK:
+    FitsMask* msk = new FitsMask(this, maskColorName, maskMark);
+    mask.append(msk);
+    Context* cc = msk->context();
+    FitsImage* img = new FitsImageFitsVar(cc, interp, ch, fn, 1);
+    loadDone(cc->load(VAR, fn, img));
     break;
   }
 }
diff --git a/tksao/frame/frame.h b/tksao/frame/frame.h
index 51e2549..9acc5e9 100644
--- a/tksao/frame/frame.h
+++ b/tksao/frame/frame.h
@@ -81,7 +81,17 @@ class Frame : public FrameBase {
 
   void savePhotoCmd(const char*);
 
+  void loadFitsAllocCmd(const char*, const char*, LayerType);
+  void loadFitsAllocGZCmd(const char*, const char*, LayerType);
+  void loadFitsChannelCmd(const char*, const char*, LayerType);
+  void loadFitsMMapCmd(const char*, LayerType);
+  void loadFitsSMMapCmd(const char*, const char*, LayerType);
   void loadFitsMMapIncrCmd(const char*, LayerType);
+  void loadFitsShareCmd(ShmType, int, const char*, LayerType);
+  void loadFitsSShareCmd(ShmType, int, int, const char*, LayerType);
+  void loadFitsSocketCmd(int, const char*, LayerType);
+  void loadFitsSocketGZCmd(int, const char*, LayerType);
+  void loadFitsVarCmd(const char*, const char*, LayerType);
 };
 
 #endif
diff --git a/tksao/frame/frload.C b/tksao/frame/frload.C
index 352bccf..3211e21 100644
--- a/tksao/frame/frload.C
+++ b/tksao/frame/frload.C
@@ -20,101 +20,87 @@
 
 void Base::loadFitsAllocCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsAlloc(currentContext, interp, 
 					  ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->load(ALLOC, fn, img), ll);
+  loadDone(currentContext->load(ALLOC, fn, img));
 }
 
 void Base::loadFitsAllocGZCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsAllocGZ(currentContext, interp, 
 					    ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->load(ALLOCGZ, fn, img), ll);
+  loadDone(currentContext->load(ALLOCGZ, fn, img));
 }
 
-void Base::loadFitsChannelCmd(const char* ch, const char* fn,LayerType ll)
+void Base::loadFitsChannelCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsChannel(currentContext, interp, 
-					    ch, fn, 
-					    FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->load(CHANNEL, fn, img), ll);
+					    ch, fn, FitsFile::NOFLUSH, 1);
+  loadDone(currentContext->load(CHANNEL, fn, img));
 }
 
 void Base::loadFitsMMapCmd(const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
-  FitsImage* img = new FitsImageFitsMMap(currentContext, interp, 
-					 fn, 1);
-  loadDone(currentContext->load(MMAP, fn, img), ll);
+  unloadFits();
+  FitsImage* img = new FitsImageFitsMMap(currentContext, interp, fn, 1);
+  loadDone(currentContext->load(MMAP, fn, img));
 }
 
 void Base::loadFitsSMMapCmd(const char* hdr, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
-  FitsImage* img = new FitsImageFitsSMMap(currentContext, interp, 
-					  hdr, fn, 1);
-  loadDone(currentContext->load(SMMAP, fn, img), ll);
+  unloadFits();
+  FitsImage* img = new FitsImageFitsSMMap(currentContext, interp, hdr, fn, 1);
+  loadDone(currentContext->load(SMMAP, fn, img));
 }
 
 void Base::loadFitsMMapIncrCmd(const char* fn, LayerType ll)
 {
   unloadFits();
   FitsImage* img = new FitsImageFitsMMapIncr(currentContext, interp, fn, 1);
-  loadDone(currentContext->load(MMAPINCR, fn, img), ll);
+  loadDone(currentContext->load(MMAPINCR, fn, img));
 }
 
 void Base::loadFitsShareCmd(ShmType stype, int id, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
-  FitsImage* img = new FitsImageFitsShare(currentContext, interp, 
+  unloadFits();
+  FitsImage* img = new FitsImageFitsShare(currentContext, interp,
 					  stype, id, fn, 1);
-  loadDone(currentContext->load(SHARE, fn, img), ll);
+  loadDone(currentContext->load(SHARE, fn, img));
 }
 
 void Base::loadFitsSShareCmd(ShmType stype, int hdr, int id, 
 			     const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsSShare(currentContext, interp, 
 					   stype, hdr, id, fn, 1);
-  loadDone(currentContext->load(SSHARE, fn, img), ll);
+  loadDone(currentContext->load(SSHARE, fn, img));
 }
 
 void Base::loadFitsSocketCmd(int s, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsSocket(currentContext, interp, 
 					   s, fn, FitsFile::FLUSH, 1);
-  loadDone(currentContext->load(SOCKET, fn, img), ll);
+  loadDone(currentContext->load(SOCKET, fn, img));
 }
 
 void Base::loadFitsSocketGZCmd(int s, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
+  unloadFits();
   FitsImage* img = new FitsImageFitsSocketGZ(currentContext, interp, 
 					     s, fn, FitsFile::FLUSH, 1);
-  loadDone(currentContext->load(SOCKETGZ, fn, img), ll);
+  loadDone(currentContext->load(SOCKETGZ, fn, img));
 }
 
 void Base::loadFitsVarCmd(const char* ch, const char* fn, LayerType ll)
 {
-  if (ll == IMG)
-    unloadFits();
-  FitsImage* img = new FitsImageFitsVar(currentContext, interp, 
-					ch, fn, 1);
-  loadDone(currentContext->load(VAR, fn, img), ll);
+  unloadFits();
+  FitsImage* img = new FitsImageFitsVar(currentContext, interp, ch, fn, 1);
+  loadDone(currentContext->load(VAR, fn, img));
 }
 
 // *** Array ***
@@ -208,7 +194,7 @@ void Base::loadENVISMMapCmd(const char* hdr, const char* fn)
 {
   unloadFits();
   FitsImage* img = new FitsImageENVISMMap(currentContext, interp, hdr, fn, 1);
-  loadDone(currentContext->load(SMMAP, fn, img), IMG);
+  loadDone(currentContext->load(SMMAP, fn, img));
 }
 
 // *** NRRD ***
@@ -275,14 +261,14 @@ void Base::loadPhotoCmd(const char* ph, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImagePhoto(currentContext, interp, 
 				      ph, fn, 1);
-  loadDone(currentContext->load(PHOTO, fn, img), IMG);
+  loadDone(currentContext->load(PHOTO, fn, img));
 }
 
 void Base::loadSlicePhotoCmd(const char* ph, const char* fn)
 {
   FitsImage* img = new FitsImagePhoto(currentContext, interp,
 				      ph, fn, 1);
-  loadDone(currentContext->loadSlice(PHOTO, fn, img), IMG);
+  loadDone(currentContext->loadSlice(PHOTO, fn, img));
 }
 
 // *** Data Cube ***
@@ -292,7 +278,7 @@ void Base::loadExtCubeAllocCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsAlloc(currentContext, interp, 
 					  ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadExtCube(ALLOC, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(ALLOC, fn, img));
 }
 
 void Base::loadExtCubeAllocGZCmd(const char* ch, const char* fn)
@@ -300,7 +286,7 @@ void Base::loadExtCubeAllocGZCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsAllocGZ(currentContext, interp, 
 					    ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadExtCube(ALLOCGZ, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(ALLOCGZ, fn, img));
 }
 
 void Base::loadExtCubeChannelCmd(const char* ch, const char* fn)
@@ -309,7 +295,7 @@ void Base::loadExtCubeChannelCmd(const char* ch, const char* fn)
   FitsImage* img = new FitsImageFitsChannel(currentContext, interp,
 					    ch, fn, 
 					    FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadExtCube(CHANNEL, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(CHANNEL, fn, img));
 }
 
 void Base::loadExtCubeMMapCmd(const char* fn)
@@ -317,7 +303,7 @@ void Base::loadExtCubeMMapCmd(const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsMMap(currentContext, interp,
 					 fn, 1);
-  loadDone(currentContext->loadExtCube(MMAP, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(MMAP, fn, img));
 }
 
 void Base::loadExtCubeMMapIncrCmd(const char* fn)
@@ -325,7 +311,7 @@ void Base::loadExtCubeMMapIncrCmd(const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsMMapIncr(currentContext, interp,
 					     fn, 1);
-  loadDone(currentContext->loadExtCube(MMAPINCR, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(MMAPINCR, fn, img));
 }
 
 void Base::loadExtCubeShareCmd(ShmType stype, int id, const char* fn)
@@ -333,7 +319,7 @@ void Base::loadExtCubeShareCmd(ShmType stype, int id, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsShare(currentContext, interp,
 					  stype, id, fn, 1);
-  loadDone(currentContext->loadExtCube(SHARE, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(SHARE, fn, img));
 }
 
 void Base::loadExtCubeSocketCmd(int s, const char* fn)
@@ -341,7 +327,7 @@ void Base::loadExtCubeSocketCmd(int s, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsSocket(currentContext, interp,
 					   s, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadExtCube(SOCKET, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(SOCKET, fn, img));
 }
 
 void Base::loadExtCubeSocketGZCmd(int s, const char* fn)
@@ -349,7 +335,7 @@ void Base::loadExtCubeSocketGZCmd(int s, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsSocketGZ(currentContext, interp,
 					     s, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadExtCube(SOCKETGZ, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(SOCKETGZ, fn, img));
 }
 
 void Base::loadExtCubeVarCmd(const char* ch, const char* fn)
@@ -357,7 +343,7 @@ void Base::loadExtCubeVarCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsVar(currentContext, interp,
 					ch, fn, 1);
-  loadDone(currentContext->loadExtCube(VAR, fn, img), IMG);
+  loadDone(currentContext->loadExtCube(VAR, fn, img));
 }
 
 // *** Slice ***
@@ -366,14 +352,14 @@ void Base::loadSliceAllocCmd(const char* ch, const char* fn)
 {
   FitsImage* img = new FitsImageFitsAlloc(currentContext, interp,
 					  ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadSlice(ALLOC, fn, img), IMG);
+  loadDone(currentContext->loadSlice(ALLOC, fn, img));
 }
 
 void Base::loadSliceAllocGZCmd(const char* ch, const char* fn)
 {
   FitsImage* img = new FitsImageFitsAllocGZ(currentContext, interp,
 					    ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadSlice(ALLOCGZ, fn, img), IMG);
+  loadDone(currentContext->loadSlice(ALLOCGZ, fn, img));
 }
 
 void Base::loadSliceChannelCmd(const char* ch, const char* fn)
@@ -381,63 +367,63 @@ void Base::loadSliceChannelCmd(const char* ch, const char* fn)
   FitsImage* img = new FitsImageFitsChannel(currentContext, interp,
 					    ch, fn,
 					    FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadSlice(CHANNEL, fn, img), IMG);
+  loadDone(currentContext->loadSlice(CHANNEL, fn, img));
 }
 
 void Base::loadSliceMMapCmd(const char* fn)
 {
   FitsImage* img = new FitsImageFitsMMap(currentContext, interp,
 					 fn, 1);
-  loadDone(currentContext->loadSlice(MMAP, fn, img), IMG);
+  loadDone(currentContext->loadSlice(MMAP, fn, img));
 }
 
 void Base::loadSliceSMMapCmd(const char* hdr, const char* fn)
 {
   FitsImage* img = new FitsImageFitsSMMap(currentContext, interp,
 					  hdr, fn, 1);
-  loadDone(currentContext->loadSlice(MMAP, fn, img), IMG);
+  loadDone(currentContext->loadSlice(MMAP, fn, img));
 }
 
 void Base::loadSliceMMapIncrCmd(const char* fn)
 {
   FitsImage* img = new FitsImageFitsMMapIncr(currentContext, interp,
 					     fn, 1);
-  loadDone(currentContext->loadSlice(MMAPINCR, fn, img), IMG);
+  loadDone(currentContext->loadSlice(MMAPINCR, fn, img));
 }
 
 void Base::loadSliceShareCmd(ShmType stype, int id, const char* fn)
 {
   FitsImage* img = new FitsImageFitsShare(currentContext, interp,
 					  stype, id, fn, 1);
-  loadDone(currentContext->loadSlice(SHARE, fn, img), IMG);
+  loadDone(currentContext->loadSlice(SHARE, fn, img));
 }
 
 void Base::loadSliceSShareCmd(ShmType stype, int hdr, int id, const char* fn)
 {
   FitsImage* img = new FitsImageFitsSShare(currentContext, interp,
 					   stype, hdr, id, fn, 1);
-  loadDone(currentContext->loadSlice(SSHARE, fn, img), IMG);
+  loadDone(currentContext->loadSlice(SSHARE, fn, img));
 }
 
 void Base::loadSliceSocketCmd(int s, const char* fn)
 {
   FitsImage* img = new FitsImageFitsSocket(currentContext, interp,
 					   s, fn, FitsFile::FLUSH, 1);
-  loadDone(currentContext->loadSlice(SOCKET, fn, img), IMG);
+  loadDone(currentContext->loadSlice(SOCKET, fn, img));
 }
 
 void Base::loadSliceSocketGZCmd(int s, const char* fn)
 {
   FitsImage* img = new FitsImageFitsSocketGZ(currentContext, interp,
 					     s, fn, FitsFile::FLUSH, 1);
-  loadDone(currentContext->loadSlice(SOCKETGZ, fn, img), IMG);
+  loadDone(currentContext->loadSlice(SOCKETGZ, fn, img));
 }
 
 void Base::loadSliceVarCmd(const char* ch, const char* fn)
 {
   FitsImage* img = new FitsImageFitsVar(currentContext, interp,
 					ch, fn, 1);
-  loadDone(currentContext->loadSlice(VAR, fn, img), IMG);
+  loadDone(currentContext->loadSlice(VAR, fn, img));
 }
 
 // *** Mosaic Image ***
@@ -639,7 +625,7 @@ void Base::loadMosaicImageWFPC2AllocCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsAlloc(currentContext, interp,
 	 ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadMosaicWFPC2(ALLOC, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(ALLOC, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2AllocGZCmd(const char* ch, const char* fn)
@@ -647,7 +633,7 @@ void Base::loadMosaicImageWFPC2AllocGZCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsAllocGZ(currentContext, interp,
 	 ch, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadMosaicWFPC2(ALLOCGZ, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(ALLOCGZ, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2ChannelCmd(const char* ch, const char* fn)
@@ -656,7 +642,7 @@ void Base::loadMosaicImageWFPC2ChannelCmd(const char* ch, const char* fn)
   FitsImage* img = new FitsImageFitsChannel(currentContext, interp,
 					    ch, fn, 
 					    FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadMosaicWFPC2(CHANNEL, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(CHANNEL, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2MMapCmd(const char* fn)
@@ -664,7 +650,7 @@ void Base::loadMosaicImageWFPC2MMapCmd(const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsMMap(currentContext, interp,
 	 fn, 1);
-  loadDone(currentContext->loadMosaicWFPC2(MMAP, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(MMAP, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2MMapIncrCmd(const char* fn)
@@ -672,7 +658,7 @@ void Base::loadMosaicImageWFPC2MMapIncrCmd(const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsMMapIncr(currentContext, interp,
 	 fn, 1);
-  loadDone(currentContext->loadMosaicWFPC2(MMAPINCR, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(MMAPINCR, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2ShareCmd(ShmType stype, int id, const char* fn)
@@ -680,7 +666,7 @@ void Base::loadMosaicImageWFPC2ShareCmd(ShmType stype, int id, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsShare(currentContext, interp,
 	 stype, id, fn, 1);
-  loadDone(currentContext->loadMosaicWFPC2(SHARE, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(SHARE, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2SocketCmd(int s, const char* fn)
@@ -688,7 +674,7 @@ void Base::loadMosaicImageWFPC2SocketCmd(int s, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsSocket(currentContext, interp,
 	 s, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadMosaicWFPC2(SOCKET, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(SOCKET, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2SocketGZCmd(int s, const char* fn)
@@ -696,7 +682,7 @@ void Base::loadMosaicImageWFPC2SocketGZCmd(int s, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsSocketGZ(currentContext, interp,
 					     s, fn, FitsFile::NOFLUSH, 1);
-  loadDone(currentContext->loadMosaicWFPC2(SOCKETGZ, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(SOCKETGZ, fn, img));
 }
 
 void Base::loadMosaicImageWFPC2VarCmd(const char* ch, const char* fn)
@@ -704,7 +690,7 @@ void Base::loadMosaicImageWFPC2VarCmd(const char* ch, const char* fn)
   unloadFits();
   FitsImage* img = new FitsImageFitsVar(currentContext, interp,
 					ch, fn, 1);
-  loadDone(currentContext->loadMosaicWFPC2(VAR, fn, img), IMG);
+  loadDone(currentContext->loadMosaicWFPC2(VAR, fn, img));
 }
 
 // ***