casa / casa5 / c3ba747648e

Commits

Dirk Petry authored c3ba747648e 12 May 2016



       New Development: Yes/No
            JIRA Issue: CAS-8580
        Ready for Test: Yes
     Interface Changes: Yes
What Interface Changed: new optional parameter forcesingleephemfield in concat
         Test Programs: test_concat
  Put in Release Notes: Yes
             Module(s): gcwrap
           Description: Improvements to the concatephem recipe and
	   		the new optional parameter forcesingleephemfield 
                        in concat which controls how concat makes use
			of the  concatephem recipe to concatenate
			ephemerides.
			Also added a test case to test_concat.
			Needs data version r10818.

gcwrap/python/scripts/recipes/ephemerides/concatephem.py

Modified

-56
+        stepsizes.append(mystepsize)
-57
-58
+    if os.path.exists(outputephem):
-59
+        casalog.post('Output ephemeris table '+outputephem+' exists already.', 'SEVERE')
-60
+        return
-61
-62
+    casalog.post('Ephem no., startMJD, endMJD, step size (d)', 'INFO')
-63
+    for i in range(0,len(starts)):
-64
+        casalog.post(str(i)+', '+str(starts[i])+', '+str(ends[i])+', '+str(stepsizes[i]), 'INFO')
-65
-+
+    backstep = 0
-67
+    for i in range(0,len(starts)):
-68
+        shouldconcat_with_previous.append(False)
-69
+        canconcat_with_previous.append(False)
-70
+        hasoverlap_with_previous.append(False)
-71
+        gap_to_previous.append(0)
-72
+        if i>0:
--
+            if stepsizes[i]==stepsizes[i-1]:
--
+                casalog.post( 'Ephemerides '+str(i-1)+' and '+str(i)+' have same step size.', 'INFO')
--
+                if starts[i-1] < starts[i]:
--
+                    casalog.post( 'Ephemeris '+str(i-1)+' begins before '+str(i), 'INFO')
--
+                    if ends[i-1] < ends[i]:
--
+                        casalog.post( 'Ephemeris '+str(i-1)+' ends before '+str(i), 'INFO')
-+
+            if stepsizes[i]==stepsizes[i-1-backstep]:
-+
+                casalog.post( 'Ephemerides '+str(i-1-backstep)+' and '+str(i)+' have same step size.', 'INFO')
-+
+                if starts[i-1-backstep] <= starts[i]:
-+
+                    casalog.post( 'Ephemeris '+str(i-1-backstep)+' begins before '+str(i), 'INFO')
-+
+                    if ends[i-1-backstep] < ends[i]:
-+
+                        casalog.post( 'Ephemeris '+str(i-1-backstep)+' ends before '+str(i), 'INFO')
-79
+                        shouldconcat_with_previous[i] = True
--
+                        numsteps_to_add = (starts[i]-ends[i-1])/stepsizes[i] - 1
-+
+                        numsteps_to_add = (starts[i]-ends[i-1-backstep])/stepsizes[i] - 1
-81
+                        gap_to_previous[i] = int(round(numsteps_to_add))
-82
+                        if abs(round(numsteps_to_add) - numsteps_to_add)<1E-6:
--
+                            casalog.post( 'Gap between ephemerides '+str(i-1)+' and '+str(i)+' is '+str(gap_to_previous[i])+' steps', 'INFO')
-+
+                            casalog.post( 'Gap between ephemerides '+str(i-1-backstep)+' and '+str(i)+' is '+str(gap_to_previous[i])+' steps', 'INFO')
-84
+                            canconcat_with_previous[i] = True
-+
+                            backstep = 0
-86
+                            if numsteps_to_add<0.:
--
+                                casalog.post(  'Ephemerides '+str(i-1)+' and '+str(i)+' have overlap of '+str(-gap_to_previous[i])+' steps', 'INFO')
-+
+                                casalog.post(  'Ephemerides '+str(i-1-backstep)+' and '+str(i)+' have overlap of '+str(-gap_to_previous[i])+' steps', 'INFO')
-88
+                                hasoverlap_with_previous[i]=True
-89
+                        else:
--
+                            casalog.post( 'Gap between ephemerides '+str(i-1)+' and '+str(i)+' is not an integer number of steps:', 'WARN')
-+
+                            casalog.post( 'Gap between ephemerides '+str(i-1-backstep)+' and '+str(i)+' is not an integer number of steps:', 'WARN')
-91
+                            casalog.post( str(round(numsteps_to_add) - numsteps_to_add), 'INFO')
-92
+                            canconcat_with_previous[i] = False
-+
+                            backstep += 1
-94
+                    else:
--
+                        casalog.post( 'Ephemeris '+str(i-1)+' does not end before '+str(i), 'INFO')
-+
+                        casalog.post( 'Ephemeris '+str(i-1-backstep)+' does not end before '+str(i), 'INFO')
-96
+                        shouldconcat_with_previous[i] = False
-97
+                        canconcat_with_previous[i] = False
-+
+                        backstep += 1
-99
+                else:
--
+                    casalog.post( 'Ephemeris '+str(i-1)+' begins before '+str(i), 'INFO')
-+
+                    casalog.post( 'Ephemeris '+str(i-1-backstep)+' does not begin before or at the same time as '+str(i), 'INFO')
-101
+                    casalog.post('Ephemerides are in wrong order.', 'SEVERE')
-102
+                    return
-103
+            else:
--
+                casalog.post( 'Ephemerides '+str(i-1)+' and '+str(i)+' do not have same step size.', 'INFO')
-+
+                casalog.post( 'Ephemerides '+str(i-1-backstep)+' and '+str(i)+' do not have same step size.', 'INFO')
-105
+                casalog.post('Ephemerides have inhomogeneous steps sizes.', 'SEVERE')
-106
+                return
-107
+        #end if
-108
-+
-110
+    if outputephem=='' or len(starts)<2:
-111
+        return
-112
+    else:
-113
+        casalog.post( 'Creating output ephemeris ...', 'INFO')
-114
-115
+        os.system('cp -R '+ephems[0]+' '+outputephem)
-116
-117
+        mytb2 = tbtool()
-118
-119
+        try:
-120
+            mytb.open(outputephem, nomodify=False)
-121
+        except:
-122
+            casalog.post('Error opening table '+outputepehem+' for writing.', 'SEVERE')
-123
+            return
-124
-125
-126
+        for i in range(1,len(starts)):
-127
--
+            mynrows = mytb.nrows()
--
--
+            mytb2.open(ephems[i])
--
+            mynrows2 = mytb2.nrows()
--
+            startrow = 0
--
+            if(hasoverlap_with_previous[i]):
--
+                startrow = -gap_to_previous[i]
--
+            elif(gap_to_previous[i]>0): # fill gap with dummy rows
--
+                mytb.addrows(gap_to_previous[i])
--
+                startmjd = mytb.getcell('MJD', mynrows-1)
--
+                for j in range(mynrows, mynrows+gap_to_previous[i]):
--
+                    newmjd = startmjd+stepsizes[i]*(j-mynrows+1)
--
+                    mytb.putcell('MJD', j, newmjd)
--
+                    mytb.putcell('RA', j, 0.)
--
+                    mytb.putcell('DEC', j, 0.)
--
+                    mytb.putcell('Rho', j, 0.)
--
+                    mytb.putcell('RadVel', j, 0.)
--
+                    mytb.putcell('diskLong', j, 0.)
--
+                    mytb.putcell('diskLat', j, 0.)
--
--
+                casalog.post( str(gap_to_previous[i])+' dummy rows appended to fill gap', 'INFO')
--
--
+            mynrows = mytb.nrows()
--
--
+            mytb.addrows(mynrows2-startrow)
--
+            for j in range(mynrows, mynrows+mynrows2-startrow):
--
+                fromrow = j - mynrows + startrow
--
+                mytb.putcell('MJD', j, mytb2.getcell('MJD', fromrow))
--
+                mytb.putcell('RA', j, mytb2.getcell('RA', fromrow))
--
+                mytb.putcell('DEC', j, mytb2.getcell('DEC', fromrow))
--
+                mytb.putcell('Rho', j, mytb2.getcell('Rho', fromrow))
--
+                mytb.putcell('RadVel', j, mytb2.getcell('RadVel', fromrow))
--
+                mytb.putcell('diskLong', j, mytb2.getcell('diskLong', fromrow))
--
+                mytb.putcell('diskLat', j, mytb2.getcell('diskLat', fromrow))
--
--
+            casalog.post( str(mynrows2-startrow)+' rows copied over', 'INFO')
-+
+            if shouldconcat_with_previous[i] and canconcat_with_previous[i]:
-+
-+
+                mynrows = mytb.nrows()
-+
-+
+                mytb2.open(ephems[i])
-+
+                mynrows2 = mytb2.nrows()
-+
+                startrow = 0
-+
+                if(hasoverlap_with_previous[i]):
-+
+                    startrow = -gap_to_previous[i]
-+
+                elif(gap_to_previous[i]>0): # fill gap with dummy rows
-+
+                    mytb.addrows(gap_to_previous[i])
-+
+                    startmjd = mytb.getcell('MJD', mynrows-1)
-+
+                    for j in range(mynrows, mynrows+gap_to_previous[i]):
-+
+                        newmjd = startmjd+stepsizes[i]*(j-mynrows+1)
-+
+                        mytb.putcell('MJD', j, newmjd)
-+
+                        mytb.putcell('RA', j, 0.)
-+
+                        mytb.putcell('DEC', j, 0.)
-+
+                        mytb.putcell('Rho', j, 0.)
-+
+                        mytb.putcell('RadVel', j, 0.)
-+
+                        mytb.putcell('diskLong', j, 0.)
-+
+                        mytb.putcell('diskLat', j, 0.)
-+
-+
+                    casalog.post( str(gap_to_previous[i])+' dummy rows appended to fill gap', 'INFO')
-+
-+
+                mynrows = mytb.nrows()
-+
-+
+                mytb.addrows(mynrows2-startrow)
-+
+                for j in range(mynrows, mynrows+mynrows2-startrow):
-+
+                    fromrow = j - mynrows + startrow
-+
+                    mytb.putcell('MJD', j, mytb2.getcell('MJD', fromrow))
-+
+                    mytb.putcell('RA', j, mytb2.getcell('RA', fromrow))
-+
+                    mytb.putcell('DEC', j, mytb2.getcell('DEC', fromrow))
-+
+                    mytb.putcell('Rho', j, mytb2.getcell('Rho', fromrow))
-+
+                    mytb.putcell('RadVel', j, mytb2.getcell('RadVel', fromrow))
-+
+                    mytb.putcell('diskLong', j, mytb2.getcell('diskLong', fromrow))
-+
+                    mytb.putcell('diskLat', j, mytb2.getcell('diskLat', fromrow))
-+
-+
+                casalog.post( str(mynrows2-startrow)+' rows copied over', 'INFO')
-+
-+
+            else:
-+
-+
+                casalog.post( 'Ephemeris '+str(i)+' skipped', 'INFO')
-+
-+
+            #endif
-+
+        #endfor
-+
+    #endif
-174
-175
+    return
-176
-177
-178
+def findephems(vis=[], field=''):
-179
-180
+    """
-181
+       findephems
-182
-183
+       Search the MSs given in the list "vis" for ephemerides for
-203
-204
+    for visname in vis:
-205
+        if not os.path.exists(visname+'/FIELD'):
-206
+            casalog.post('MS '+visname+' does not exist.', 'SEVERE')
-207
+            return []
-208
-209
+        mytb.open(visname+'/FIELD')
-210
+        fnames = mytb.getcol('NAME')
-211
-212
+        if type(field) == int:
--
+            field = fnames[field]
--
+        elif type(field) != str:
-+
+            field = str(fnames[field])
-+
+        if type(field) != str:
-215
+            casalog.post('Parameter field must be str or int.', 'SEVERE')
-216
+            mytb.close()
-217
+            return []
-218
-219
+        if field in fnames:
-220
+            colnames = mytb.colnames()
-221
+            if not 'EPHEMERIS_ID' in colnames:
-222
+                casalog.post('MS '+visname+' has no ephemerides attached.', 'WARN')
-223
+                rval.append('')
-224
+                mytb.close()

casa5

Commits

Jira Issues

Add shortcut