Changeset 9618
- Timestamp:
- 07/28/10 14:52:12 (14 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9615 r9618 19 19 -*-*- END OF LINE -*-*- 20 20 21 2010/07/28 Daniela Dorner 22 23 * datacenter/db/menu.php: 24 - updated initial parameter selection for mcinfo.php 25 - changed table for GetMin/Max to CeresInfo 26 27 * datacenter/db/mcinfo.php: 28 - bugfix for removing WHERE or AND at end of queries 29 - added fStopTime to status-column in case of failure 30 - bugfix for correct joins in case of group-by 31 32 * datacenter/db/mcdefs.php: 33 - updated runtime of ceres 34 - updated joins for status tables 35 36 * datacenter/scripts/insertmc: 37 - added (script to add runs to the database) 38 39 * datacenter/scripts/runcorsika: 40 - added check if 'END OF FILE' is contained in logfile 41 - added check if file number > 999 and change filename if it is 42 43 * datacenter/scripts/setup.wue.fact.mc: 44 - removed cprun 45 - added callisto and star in scripts-array 46 47 * datacenter/scripts/sourcefile: 48 - removed variables for fProgramId 49 50 * resources/steps_fact.rc: 51 - added missing needs 52 53 54 21 55 2010/07/09 Thomas Bretz 22 56 -
trunk/MagicSoft/Mars/datacenter/scripts/runcorsika
r9605 r9618 207 207 case $check1 in 208 208 0) printprocesslog "INFO $program finished successfully for run $run file $file (return code $check1)" 209 if [ $file -gt 999 ] 210 then 211 corsikafilenew=$mcpath/$program/`printf %08d $run | cut -c 1-4`/`printf %08d $run | cut -c 5-8`/cer000`printf %06d $file | cut -c 4-6` 212 corsikafileold=$mcpath/$program/`printf %08d $run | cut -c 1-4`/`printf %08d $run | cut -c 5-8`/cer`printf %06d $file` 213 if ! mv $corsikafileold $corsikafilenew 214 then 215 printprocesslog "ERROR could not mv $corsikafileold to $corsikafilenew" 216 check=2 217 fi 218 fi 219 if ! grep 'END OF RUN' $logfile 220 then 221 printprocesslog "ERROR could not find 'END OF RUN' in $logfile => unknown error for run $run file $file " 222 check=2 223 fi 209 224 ;; 210 225 *) printprocesslog "ERROR $program failed for run $run file $file (return code $check1)" -
trunk/MagicSoft/Mars/datacenter/scripts/setup.wue.fact.mc
r9604 r9618 95 95 96 96 #hour: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 97 pnototal=( 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )98 pnototalwe=( 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 )97 pnototal=( 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 ) 98 pnototalwe=( 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 ) 99 99 100 100 pnocorsika=( 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 ) 101 pnoceres=( 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 ) 102 pnocprun=( 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 ) 103 pnocallisto=( 32 32 32 32 32 30 30 18 18 15 15 15 15 15 15 15 15 15 15 18 18 30 30 32 ) 101 pnoceres=( 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 ) 102 pnocallisto=( 32 32 32 32 32 30 30 18 18 20 20 20 20 20 20 20 20 20 20 18 18 30 30 32 ) 104 103 pnostar=( 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 ) 105 104 106 105 pnocorsikawe=( 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 ) 107 pnocereswe=( 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 ) 108 pnocprunwe=( 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 ) 106 pnocereswe=( 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 ) 109 107 pnocallistowe=( 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 32 ) 110 108 pnostarwe=( 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 ) 111 109 112 110 # set variables for jobmanager 113 scripts=( "runcorsika" "runceres" )114 scriptscolname=( "Corsika" "Ceres" )115 pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} )116 pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} )111 scripts=( "runcorsika" "runceres" "runcallisto_mc" "runstar_mc" ) 112 scriptscolname=( "Corsika" "Ceres" "Callisto" "Star" ) 113 pnosweek=( ${pnocorsika[@]} ${pnoceres[@]} ${pnocallisto[@]} ${pnostar[@]} ) 114 pnoswe=( ${pnocorsikawe[@]} ${pnocereswe[@]} ${pnocallistowe[@]} ${pnostarwe[@]} ) 117 115 -
trunk/MagicSoft/Mars/datacenter/scripts/sourcefile
r9610 r9618 108 108 check="ok" 109 109 110 #failed codes111 #sequence build status112 Fbuildsequ=1113 Fdoexcl=2114 #run process status115 Ftimecorr=3116 Ffillraw=4117 Fsinope=5118 Ffillsinope=6119 Fresetexcl=7120 #sequence process status121 Fwritesequfile=8122 Ffilesavail=9123 Fnoccfile=10124 Fnocacofile=11125 Fmerppcc=12126 Fmerppcaco=13127 Fcallisto=14128 Ffillcalib=15129 Ffillsignal=16130 Fstar=17131 Ffillstar=18132 #dataset process status133 Fwritedatasetfile=19134 Fstardone=20135 Fganymed=21136 Ffillganymed=22137 #again run process status138 FCompmux=26139 Fdowebplots=27140 #again mc run process status141 Fmccallisto=28142 Ffillmccalib=29143 Ffillmcsignal=30144 Fmcstar=31145 Ffillmcstar=32146 Fcorsikasimtel=33147 Fchimp=34148 Fchimpcp=35149 Fctastar=36150 Fctastarcp=37151 FctastereoA=38152 FctastereoB=39153 FctastereoC=40154 FctastereoD=41155 FctastereoE=42156 FctastereoF=43157 FctastereoG=44158 FctastereoH=45159 Fctastereocp=46160 161 110 # setup for jobmanager: 162 111 # log files (can't be defined in script itself, as script can run longer … … 177 126 fi 178 127 179 # resetting values 128 # resetting values for jobmanager 180 129 pno=0 181 130 totalpno=0 -
trunk/MagicSoft/Mars/resources/steps_fact.rc
r9605 r9618 3 3 4 4 Ceres.Primaries: fRunNumber, fFileNumber, fCeresSetupKEY 5 Ceres.Needs: Corsika 5 6 Ceres.SpecialNeedJoin: LEFT JOIN CeresInfo USING(fSequenceNumber, fCeresSetupKEY) 6 7 Ceres.SpecialInfluenceJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber, fCeresSetupKEY)
Note:
See TracChangeset
for help on using the changeset viewer.