Does dE tag without PSF image

Author: Sebokolodi

Sourcery/direcdepen.py

@@ -13,7 +13,7 @@
 class load(object):
 
 
-    def __init__(self, imagename, psfname, poscatalog, negcatalog,
+    def __init__(self, imagename, poscatalog, negcatalog, psfname=None,
                  snr_thresh=100, local_thresh=0.6, local_region=10,
                  psfcorr_region=2, high_corr_thresh=0.5, negdetec_region=10, 
                  negatives_thresh=10, phasecenter_excl_radius=None,
@@ -60,13 +60,17 @@ def __init__(self, imagename, psfname, poscatalog, negcatalog,
         """
 
         # image, psf image, positive and negative catalogues
+        self.loglevel = loglevel
+        self.prefix = prefix
+        self.log = utils.logger(self.loglevel, prefix=self.prefix)
         self.imagename = imagename
+
         self.psfname = psfname
+        if not self.psfname:
+            self.log.info("dE tagging will be made without the PSF correlation"
+                    " note that this might affect the results.")
         self.poscatalog = poscatalog
         self.negcatalog = negcatalog
-        self.loglevel = loglevel
-        self.prefix = prefix
-        self.log = utils.logger(self.loglevel, prefix=self.prefix)
 
         # reading the imagename data
         self.imagedata, self.wcs, self.header, self.pixsize =\
@@ -126,8 +130,12 @@ def number_negatives(self):
 
         pmodel = Tigger.load(self.poscatalog, verbose=self.loglevel)
         nmodel = Tigger.load(self.negcatalog, verbose=self.loglevel)
-        psources = pmodel.sources 
-        sources = filter(lambda src: src.getTag(self.high_corr_tag), psources)
+        psources = pmodel.sources
+        if not self.psfname:
+            sources = filter(lambda src: src.getTag(self.high_local_tag), psources)
+            
+        else:    
+            sources = filter(lambda src: src.getTag(self.high_corr_tag), psources)
 
         tolerance = numpy.deg2rad(self.negdetec_region * self.bmaj_deg)
 
@@ -158,13 +166,14 @@ def source_selection(self):
              high_local_tag=self.high_local_tag, neg_side=True,
              setatr=False, prefix=self.prefix, do_high_loc=True)
         # correlation
-        utils.psf_image_correlation(
-            catalog=self.poscatalog, psfimage=self.psfname,
-            imagedata=self.imagedata, header=self.header,
-            wcs=self.wcs, pixelsize=self.pixsize, corr_region=
-            self.psfcorr_region, thresh=self.high_corr_thresh,
-            tags=self.high_local_tag, coefftag=self.high_corr_tag,
-            setatr=False, do_high=True, prefix=self.prefix)
+        if self.psfname:
+            utils.psf_image_correlation(
+                catalog=self.poscatalog, psfimage=self.psfname,
+                imagedata=self.imagedata, header=self.header,
+                wcs=self.wcs, pixelsize=self.pixsize, corr_region=
+                self.psfcorr_region, thresh=self.high_corr_thresh,
+                tags=self.high_local_tag, coefftag=self.high_corr_tag,
+                setatr=False, do_high=True, prefix=self.prefix)
         # number of negative detections
         self.number_negatives()
 

Sourcery/main.py

@@ -248,8 +248,8 @@ def get_prefix(prefix, imagename, outdir):
                     os.system("tigger-convert --select='rel>%.3f' %s %s -f"
                               %(args.rel_thresh, pos, pos))
 
-                if enable and args.psf:
-                    dc = dd.load(image, psf, **ddict)
+                if enable:
+                    dc = dd.load(image, psfname=psf, **ddict)
                     ppos, nneg = dc.source_selection()
 
         else:
@@ -269,8 +269,8 @@ def get_prefix(prefix, imagename, outdir):
                 os.system("tigger-convert --select='rel>%.3f' %s %s -f"
                          %(args.rel_thresh, pos, pos))
 
-            if enable and psf:
-                dc = dd.load(image, psf, **ddict)
+            if enable:
+                dc = dd.load(image, psfname=psf, **ddict)
                 ppos, nneg = dc.source_selection()
 
     else:
@@ -310,15 +310,15 @@ def get_prefix(prefix, imagename, outdir):
                 os.system("tigger-convert --select='rel>%.3f' %s %s -f"
                          %(args.rel_thresh, pos, pos))
             # direction dependent detection tagging
-            if args.psf:
-                dc = dd.load(imagename=image, psfname=psf, poscatalog=pos, negcatalog=neg,
-                           snr_thresh=args.snr_thresh, local_thresh=args.locvar_thresh,
-                           local_region=locregion, psfcorr_region=psfregion, 
-                           high_corr_thresh=args.psfcorr_thresh, negdetec_region=
-                           args.neg_region, negatives_thresh=args.num_negatives,
-                           phasecenter_excl_radius=args.phase_center_rm, prefix=prefix,
-                           loglevel=args.log_level)
+            
+            dc = dd.load(imagename=image, psfname=psf, poscatalog=pos, negcatalog=neg,
+                    snr_thresh=args.snr_thresh, local_thresh=args.locvar_thresh,
+                    local_region=locregion, psfcorr_region=psfregion, 
+                    high_corr_thresh=args.psfcorr_thresh, negdetec_region=
+                    args.neg_region, negatives_thresh=args.num_negatives,
+                    phasecenter_excl_radius=args.phase_center_rm, prefix=prefix,
+                    loglevel=args.log_level)
             # tagging
-                ppose, nneg = dc.source_selection()
+            ppose, nneg = dc.source_selection()
 
     os.system("rm -r tmp*.log")