Commits
3458 3458 | |
3459 3459 | # Compare results |
3460 3460 | self.assertEqual(res1['flagged'], res2['flagged']) |
3461 3461 | |
3462 3462 | def test_rflag_timeavg(self): |
3463 3463 | '''flagdata: rflag with time average and compare vs mstransform''' |
3464 3464 | |
3465 3465 | # Unflag the original input data |
3466 3466 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3467 3467 | |
3468 - | # STEP 1: Time average with mstransform, then flagging with normal clip |
3468 + | # STEP 1: Time average with mstransform, then flagging with normal rflag |
3469 3469 | mstransform(vis=self.vis,outputvis='test_rflag_timeavg_step1.ms',datacolumn='data', |
3470 3470 | timeaverage=True,timebin='2s') |
3471 3471 | flagdata(vis='test_rflag_timeavg_step1.ms',flagbackup=False, mode='rflag',extendflags=False) |
3472 3472 | res1 = flagdata(vis='test_rflag_timeavg_step1.ms', mode='summary', spwchan=True) |
3473 3473 | |
3474 3474 | # Unflag the original input data |
3475 3475 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3476 3476 | |
3477 - | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3477 + | # STEP 2: Flagging with rflag using time average, then time average with mstransform |
3478 3478 | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3479 3479 | timeavg=True, timebin='2s', extendflags=False) |
3480 3480 | mstransform(vis=self.vis,outputvis='test_rflag_timeavg_step2.ms',datacolumn='data', |
3481 3481 | timeaverage=True,timebin='2s') |
3482 3482 | res2 = flagdata(vis='test_rflag_timeavg_step2.ms', mode='summary', spwchan=True) |
3483 3483 | |
3484 3484 | # Compare results |
3485 - | self.assertEqual(res2['flagged'], 20) |
3486 - | |
3485 + | self.assertEqual(res2['flagged'], 20) |
3486 + | |
3487 3487 | def test_rflag_chanavg(self): |
3488 3488 | '''flagdata: rflag with chan average and compare vs mstransform''' |
3489 3489 | |
3490 3490 | # Unflag the original input data |
3491 3491 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3492 3492 | |
3493 - | # STEP 1: Chan average with mstransform, then flagging with normal clip |
3493 + | # STEP 1: Chan average with mstransform, then flagging with normal rflag |
3494 3494 | mstransform(vis=self.vis,outputvis='test_rflag_chanavg_step1.ms',datacolumn='data', |
3495 3495 | chanaverage=True,chanbin=2) |
3496 3496 | flagdata(vis='test_rflag_chanavg_step1.ms',flagbackup=False, mode='rflag',extendflags=False) |
3497 3497 | res1 = flagdata(vis='test_rflag_chanavg_step1.ms', mode='summary', spwchan=True) |
3498 3498 | |
3499 3499 | # Unflag the original input data |
3500 3500 | flagdata(vis=self.vis, flagbackup=False, mode='unflag') |
3501 3501 | |
3502 - | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3503 - | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3502 + | # STEP 2: Flagging with rflag using time average, then time average with mstransform |
3503 + | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3504 3504 | channelavg=True, chanbin=2,extendflags=False) |
3505 3505 | mstransform(vis=self.vis, outputvis='test_rflag_chanavg_step2.ms',datacolumn='data', |
3506 3506 | chanaverage=True,chanbin=2) |
3507 3507 | res2 = flagdata(vis='test_rflag_chanavg_step2.ms', mode='summary', spwchan=True) |
3508 3508 | |
3509 3509 | # Compare results |
3510 3510 | self.assertEqual(res1['flagged'], res2['flagged']) |
3511 - | |
3511 + | |
3512 3512 | def test_rflag_time_chanavg(self): |
3513 3513 | '''flagdata: rflag with time/chan average and compare vs mstransform''' |
3514 3514 | |
3515 3515 | # Unflag the original input data |
3516 3516 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3517 3517 | |
3518 - | # STEP 1: Chan average with mstransform, then flagging with normal clip |
3518 + | # STEP 1: Chan average with mstransform, then flagging with normal rflag |
3519 3519 | mstransform(vis=self.vis,outputvis='test_rflag_time_chanavg_step1.ms',datacolumn='data', |
3520 3520 | timeaverage=True,timebin='2s',chanaverage=True,chanbin=2) |
3521 - | flagdata(vis='test_rflag_time_chanavg_step1.ms',flagbackup=False, mode='clip',extendflags=False) |
3521 + | flagdata(vis='test_rflag_time_chanavg_step1.ms',flagbackup=False, mode='rflag', |
3522 + | extendflags=False) |
3522 3523 | res1 = flagdata(vis='test_rflag_time_chanavg_step1.ms', mode='summary', spwchan=True) |
3523 3524 | |
3524 3525 | # Unflag the original input data |
3525 3526 | flagdata(vis=self.vis, flagbackup=False, mode='unflag') |
3526 3527 | |
3527 - | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3528 - | flagdata(vis=self.vis, flagbackup=False, mode='clip', datacolumn='DATA', |
3528 + | # STEP 2: Flagging with rflag using time average, then time average with mstransform |
3529 + | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3529 3530 | timeavg=True, timebin='2s', channelavg=True, chanbin=2, extendflags=False) |
3530 3531 | mstransform(vis=self.vis, outputvis='test_rflag_time_chanavg_step2.ms',datacolumn='data', |
3531 3532 | timeaverage=True,timebin='2s',chanaverage=True,chanbin=2) |
3532 3533 | res2 = flagdata(vis='test_rflag_time_chanavg_step2.ms', mode='summary', spwchan=True) |
3533 3534 | |
3534 - | # Compare results |
3535 - | self.assertEqual(res1['flagged'], res2['flagged']) |
3535 + | # Check results |
3536 + | self.assertEqual(res1['flagged'], 20) |
3537 + | self.assertEqual(res2['flagged'], 62) |
3536 3538 | |
3537 3539 | def test_tfcrop_timeavg(self): |
3538 3540 | '''flagdata: tfcrop with time average and compare vs mstransform''' |
3539 3541 | |
3540 3542 | # Unflag the original input data |
3541 3543 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3542 3544 | |
3543 - | # STEP 1: Time average with mstransform, then flagging with normal clip |
3545 + | # STEP 1: Time average with mstransform, then flagging with normal tfcrop |
3544 3546 | mstransform(vis=self.vis,outputvis='test_tfcrop_timeavg_step1.ms',datacolumn='data', |
3545 3547 | timeaverage=True,timebin='2s') |
3546 - | flagdata(vis='test_tfcrop_timeavg_step1.ms',flagbackup=False, mode='rflag',extendflags=False) |
3548 + | flagdata(vis='test_tfcrop_timeavg_step1.ms',flagbackup=False, mode='tfcrop', |
3549 + | extendflags=False) |
3547 3550 | res1 = flagdata(vis='test_tfcrop_timeavg_step1.ms', mode='summary', spwchan=True) |
3548 3551 | |
3549 3552 | # Unflag the original input data |
3550 3553 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3551 3554 | |
3552 3555 | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3553 - | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3556 + | flagdata(vis=self.vis, flagbackup=False, mode='tfcrop', datacolumn='DATA', |
3554 3557 | timeavg=True, timebin='2s', extendflags=False) |
3555 3558 | mstransform(vis=self.vis,outputvis='test_tfcrop_timeavg_step2.ms',datacolumn='data', |
3556 3559 | timeaverage=True,timebin='2s') |
3557 3560 | res2 = flagdata(vis='test_tfcrop_timeavg_step2.ms', mode='summary', spwchan=True) |
3558 3561 | |
3559 - | # Compare results |
3560 - | self.assertEqual(res2['flagged'], 20) |
3562 + | # Check results |
3563 + | self.assertEqual(res1['flagged'], 0) |
3564 + | self.assertEqual(res2['flagged'], 0) |
3561 3565 | |
3562 3566 | def test_tfcrop_chanavg(self): |
3563 3567 | '''flagdata: tfcrop with chan average and compare vs mstransform''' |
3564 3568 | |
3565 3569 | # Unflag the original input data |
3566 3570 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3567 3571 | |
3568 - | # STEP 1: Chan average with mstransform, then flagging with normal clip |
3572 + | # STEP 1: Chan average with mstransform, then flagging with normal tfcrop |
3569 3573 | mstransform(vis=self.vis,outputvis='test_tfcrop_chanavg_step1.ms',datacolumn='data', |
3570 3574 | chanaverage=True,chanbin=2) |
3571 - | flagdata(vis='test_tfcrop_chanavg_step1.ms',flagbackup=False, mode='rflag',extendflags=False) |
3575 + | flagdata(vis='test_tfcrop_chanavg_step1.ms',flagbackup=False, mode='tfcrop', |
3576 + | extendflags=False) |
3572 3577 | res1 = flagdata(vis='test_tfcrop_chanavg_step1.ms', mode='summary', spwchan=True) |
3573 3578 | |
3574 3579 | # Unflag the original input data |
3575 3580 | flagdata(vis=self.vis, flagbackup=False, mode='unflag') |
3576 3581 | |
3577 - | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3578 - | flagdata(vis=self.vis, flagbackup=False, mode='rflag', datacolumn='DATA', |
3582 + | # STEP 2: Flagging with tfcrop using time average, then time average with mstransform |
3583 + | flagdata(vis=self.vis, flagbackup=False, mode='tfcrop', datacolumn='DATA', |
3579 3584 | channelavg=True, chanbin=2,extendflags=False) |
3580 3585 | mstransform(vis=self.vis, outputvis='test_tfcrop_chanavg_step2.ms',datacolumn='data', |
3581 3586 | chanaverage=True,chanbin=2) |
3582 3587 | res2 = flagdata(vis='test_tfcrop_chanavg_step2.ms', mode='summary', spwchan=True) |
3583 3588 | |
3584 3589 | # Compare results |
3585 3590 | self.assertEqual(res1['flagged'], res2['flagged']) |
3586 3591 | |
3587 3592 | def test_tfcrop_time_chanavg(self): |
3588 3593 | '''flagdata: tfcrop with time/chan average and compare vs mstransform''' |
3589 3594 | |
3590 3595 | # Unflag the original input data |
3591 3596 | flagdata(self.vis, flagbackup=False, mode='unflag') |
3592 3597 | |
3593 - | # STEP 1: Chan average with mstransform, then flagging with normal clip |
3598 + | # STEP 1: Chan average with mstransform, then flagging with normal tfcrop |
3594 3599 | mstransform(vis=self.vis,outputvis='test_tfcrop_time_chanavg_step1.ms',datacolumn='data', |
3595 3600 | timeaverage=True,timebin='2s',chanaverage=True,chanbin=2) |
3596 - | flagdata(vis='test_tfcrop_time_chanavg_step1.ms',flagbackup=False, mode='clip',extendflags=False) |
3601 + | flagdata(vis='test_tfcrop_time_chanavg_step1.ms',flagbackup=False, mode='tfcrop',extendflags=False) |
3597 3602 | res1 = flagdata(vis='test_tfcrop_time_chanavg_step1.ms', mode='summary', spwchan=True) |
3598 3603 | |
3599 3604 | # Unflag the original input data |
3600 3605 | flagdata(vis=self.vis, flagbackup=False, mode='unflag') |
3601 3606 | |
3602 - | # STEP 2: Flagging with clip using time average, then time average with mstransform |
3603 - | flagdata(vis=self.vis, flagbackup=False, mode='clip', datacolumn='DATA', |
3607 + | # STEP 2: Flagging with tfcrop using time average, then time average with mstransform |
3608 + | flagdata(vis=self.vis, flagbackup=False, mode='tfcrop', datacolumn='DATA', |
3604 3609 | timeavg=True, timebin='2s', channelavg=True, chanbin=2, extendflags=False) |
3605 3610 | mstransform(vis=self.vis, outputvis='test_tfcrop_time_chanavg_step2.ms',datacolumn='data', |
3606 3611 | timeaverage=True,timebin='2s',chanaverage=True,chanbin=2) |
3607 3612 | res2 = flagdata(vis='test_tfcrop_time_chanavg_step2.ms', mode='summary', spwchan=True) |
3608 3613 | |
3609 3614 | # Compare results |
3610 3615 | self.assertEqual(res2['flagged'], res2['flagged']) |
3611 3616 | |
3612 3617 | class test_virtual_col(test_base): |
3613 3618 | def setUp(self): |