Commits

Takeshi Nakazato authored 404299c4ede Merge
Merge branch 'master' into CAS-14143

casatasks/src/private/task_fringefit.py

Modified
61 61 mycb.setcorrdepflags(True)
62 62 # Arrange applies....
63 63
64 64 if docallib:
65 65 # by cal library from file
66 66 mycallib=callibrary()
67 67 mycallib.read(callib)
68 68 mycb.setcallib(mycallib.cld)
69 69
70 70 else:
71 - if paramactive is None or paramactive==[]:
72 - paramactive=[True, True, False]
73 - else:
74 - if len(paramactive)!=3:
75 - casalog.post("paramactive: " + paramactive)
76 - raise ValueError( 'Error: paramactive vector must have exactly three entries' )
77 - # Have to solve for peculiar phase!
78 - paramactive.insert(0, True)
79 -
80 - if concatspws is None:
81 - concatspws=True
82 71 # by traditional parameters
83 72
84 73 ngaintab = 0;
85 74 if (gaintable!=['']):
86 75 ngaintab=len(gaintable)
87 76
88 77 ngainfld = len(gainfield)
89 78 nspwmap = len(spwmap)
90 79 ninterp = len(interp)
91 80
113 102 # interp is 'linear' unless specified
114 103 thisinterp='linear'
115 104 if (igt<ninterp):
116 105 if (interp[igt]==''):
117 106 interp[igt]=thisinterp;
118 107 thisinterp=interp[igt];
119 108
120 109 mycb.setapply(t=0.0,table=gaintable[igt],field=thisgainfield,
121 110 calwt=True,spwmap=thisspwmap,interp=thisinterp)
122 111
123 - if len(delaywindow) != 2:
124 - delaywindow = [-1e6, 1e6]
125 - if len(ratewindow) != 2:
126 - ratewindow = [-1e6, 1e6]
127 -
128 112 # ...and now the specialized terms
129 - # (BTW, interp irrelevant for these, since they are evaluated)
113 + if paramactive is None or paramactive==[]:
114 + paramactive=[True, True, False]
115 + else:
116 + if len(paramactive)!=3:
117 + casalog.post("paramactive: " + paramactive)
118 + raise ValueError( 'Error: paramactive vector must have exactly three entries' )
119 + # Have to solve for peculiar phase!
120 + paramactive.insert(0, True)
121 +
122 + if len(delaywindow) != 2:
123 + delaywindow = [-1e6, 1e6]
124 + if len(ratewindow) != 2:
125 + ratewindow = [-1e6, 1e6]
130 126
131 127 # Apply parallactic angle, if requested
132 128 if parang: mycb.setapply(type='P')
133 -
134 129 # Set up for solving; only support one gaintype
135 130 mycb.setsolve(type="FRINGE",t=solint,refant=refant,preavg=0.001,
136 131 minsnr=minsnr,combine=combine,
137 132 zerorates=zerorates,
138 133 globalsolve=globalsolve,
139 134 niter=niter,
140 135 corrcomb=corrcomb,
141 136 delaywindow=delaywindow,
142 137 ratewindow=ratewindow,
143 138 paramactive=paramactive,

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut