Changeset 26919
- Timestamp:
- Feb 11, 2010, 5:21:29 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
ippScripts/scripts/automate_stacks.pl (modified) (10 diffs)
-
ippconfig/recipes/nightly_science.config (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippScripts/scripts/automate_stacks.pl
r26831 r26919 121 121 my @filter_list = (); 122 122 my %tessID_list = (); 123 my %obsmode_list = (); 124 my %object_list = (); 123 125 my %comment_list= (); 124 126 my %stackable_list = (); … … 153 155 elsif (${ $tentry }{name} eq 'TESS') { 154 156 $tessID_list{$this_target} = ${ $tentry }{value}; 157 } 158 elsif (${ $tentry }{name} eq 'OBSMODE') { 159 $obsmode_list{$this_target} = ${ $tentry }{value}; 160 } 161 elsif (${ $tentry }{name} eq 'OBJECT') { 162 $object_list{$this_target} = ${ $tentry }{value}; 155 163 } 156 164 elsif (${ $tentry }{name} eq 'COMMENT') { … … 438 446 my $target = shift; 439 447 440 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);448 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target); 441 449 442 450 my $select = "-dateobs_begin ${date}T00:00:00 -dateobs_end ${date}T23:59:59 "; … … 447 455 $cmd .= " -set_label $label "; 448 456 $cmd .= " -set_workdir $workdir -set_dist_group $dist_group "; 449 $cmd .= " -set_tess_id $tess_id -comment '$comment' -set_data_group $data_group "; 457 $cmd .= " -set_tess_id $tess_id -set_data_group $data_group "; 458 if (defined($obs_mode)) { 459 $cmd .= " -obs_mode '$obs_mode' "; 460 } 461 if (defined($object)) { 462 $cmd .= " -object '$object' "; 463 } 464 if (defined($comment)) { 465 $cmd .= " -comment '$comment' "; 466 } 450 467 $cmd .= " $select "; 451 468 if ($debug == 1) { … … 463 480 my $db = init_gpc_db(); 464 481 $date =~ s/-//g; 465 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);482 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target); 466 483 467 484 my $sth = "SELECT exp_id from chipRun where data_group = '$data_group' AND exp_id = $exp_id"; … … 548 565 my $filter = shift; 549 566 550 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);567 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target); 551 568 552 569 my $select = "-select_dateobs_begin ${date}T00:00:00 -select_dateobs_end ${date}T23:59:59 "; … … 575 592 my $db = init_gpc_db(); 576 593 $date =~ s/-//g; 577 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);594 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target); 578 595 579 596 my $sth = "SELECT skycell_id from stackRun where data_group = '$data_group' AND skycell_id = '$skycell' AND filter = '$filter'"; … … 588 605 my $filter = shift; 589 606 590 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target);607 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($date,$target); 591 608 # check warp stage == chip stage 592 609 my $db = init_gpc_db(); … … 688 705 my $cleaning_date = $dt->ymd; 689 706 690 my ($label,$workdir,$ comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($cleaning_date,$target);707 my ($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group) = get_tool_parameters($cleaning_date,$target); 691 708 692 709 my $args .= " -dbname gpc1 -updaterun -set_state goto_cleaned -state full -data_group $data_group "; … … 745 762 my $label = "${target}.nightlyscience"; 746 763 my $workdir = "neb://\@HOST\@.0/gpc1/${target}.nt/${workdir_date}"; 764 my $obs_mode = $obsmode_list{$target}; 765 my $object = $object_list{$target}; 747 766 my $comment = $comment_list{$target}; 748 767 my $dist_group = $target; 749 768 my $data_group = "${target}.${trunc_date}"; 750 769 my $tess_id = $tessID_list{$target}; 751 return($label,$workdir,$comment,$tess_id,$dist_group,$data_group); 770 771 return($label,$workdir,$obs_mode,$object,$comment,$tess_id,$dist_group,$data_group); 752 772 } 753 773 -
trunk/ippconfig/recipes/nightly_science.config
r26831 r26919 10 10 TARGETS MULTI 11 11 TARGETS METADATA 12 NAME STR CMB13 TESS STR RINGS.V014 COMMENT STR CMB_Cold%15 STACKABLE BOOL FALSE16 END17 TARGETS METADATA18 12 NAME STR M31 19 13 TESS STR M31 14 OBSMODE STR M31 20 15 COMMENT STR M31% 21 16 STACKABLE BOOL TRUE … … 24 19 NAME STR MD01 25 20 TESS STR MD01 26 COMMENT STR MD01% 21 OBSMODE STR MD 22 # OBJECT STR MD01 23 COMMENT STR %MD01% 27 24 STACKABLE BOOL TRUE 28 25 END … … 30 27 NAME STR MD02 31 28 TESS STR MD02 32 COMMENT STR MD02% 29 OBSMODE STR MD 30 # OBJECT STR MD02 31 COMMENT STR %MD02% 33 32 STACKABLE BOOL TRUE 34 33 END … … 36 35 NAME STR MD03 37 36 TESS STR MD03 38 COMMENT STR MD03% 37 OBSMODE STR MD 38 # OBJECT STR MD03 39 COMMENT STR %MD03% 39 40 STACKABLE BOOL TRUE 40 41 END … … 42 43 NAME STR MD04 43 44 TESS STR MD04 44 COMMENT STR MD04% 45 OBSMODE STR MD 46 # OBJECT STR MD04 47 COMMENT STR %MD04% 45 48 STACKABLE BOOL TRUE 46 49 END … … 48 51 NAME STR MD05 49 52 TESS STR MD05 50 COMMENT STR MD05% 53 OBSMODE STR MD 54 # OBJECT STR MD05 55 COMMENT STR %MD05% 51 56 STACKABLE BOOL TRUE 52 57 END … … 54 59 NAME STR MD06 55 60 TESS STR MD06 56 COMMENT STR MD06% 61 OBSMODE STR MD 62 # OBJECT STR MD06 63 COMMENT STR %MD06% 57 64 STACKABLE BOOL TRUE 58 65 END … … 60 67 NAME STR MD07 61 68 TESS STR MD07 62 COMMENT STR MD07% 69 OBSMODE STR MD 70 # OBJECT STR MD07 71 COMMENT STR %MD07% 63 72 STACKABLE BOOL TRUE 64 73 END … … 66 75 NAME STR MD08 67 76 TESS STR MD08 68 COMMENT STR MD08% 77 OBSMODE STR MD 78 # OBJECT STR MD08 79 COMMENT STR %MD08% 69 80 STACKABLE BOOL TRUE 70 81 END … … 72 83 NAME STR MD09 73 84 TESS STR MD09 74 COMMENT STR MD09% 85 OBSMODE STR MD 86 # OBJECT STR MD09 87 COMMENT STR %MD09% 75 88 STACKABLE BOOL TRUE 76 89 END … … 78 91 NAME STR MD10 79 92 TESS STR MD10 80 COMMENT STR MD10% 93 OBSMODE STR MD 94 # OBJECT STR MD10 95 COMMENT STR %MD10% 81 96 STACKABLE BOOL TRUE 82 97 END 83 98 TARGETS METADATA 84 99 NAME STR STS 85 TESS STR STS 100 TESS STR RINGS.V0 101 OBSMODE STR STS 102 # OBJECT STR STS 86 103 COMMENT STR Stellar Transit% 87 104 STACKABLE BOOL TRUE 88 105 END 89 106 TARGETS METADATA 90 NAME STR SVS91 TESS STR RINGS.V092 COMMENT STR SVS%93 STACKABLE BOOL FALSE94 END95 TARGETS METADATA96 107 NAME STR SweetSpot 97 108 TESS STR RINGS.V0 98 COMMENT STR Sweetspot% 109 OBSMODE STR SS 110 # OBJECT STR SS 99 111 STACKABLE BOOL FALSE 100 112 END … … 102 114 NAME STR ThreePi 103 115 TESS STR RINGS.V0 104 COMMENT STR ThreePi% 116 OBSMODE STR 3PI 117 # OBJECT STR 3PI 105 118 STACKABLE BOOL FALSE 106 119 END 120 # TARGETS METADATA 121 # NAME STR CMB 122 # TESS STR RINGS.V0 123 # COMMENT STR CMB_Cold% 124 # STACKABLE BOOL FALSE 125 # END 126 # TARGETS METADATA 127 # NAME STR SVS 128 # TESS STR RINGS.V0 129 # COMMENT STR SVS% 130 # STACKABLE BOOL FALSE 131 # END
Note:
See TracChangeset
for help on using the changeset viewer.
