Changeset 626 for BAORadio/AmasNancay/trunk
- Timestamp:
- Dec 14, 2011, 11:23:44 AM (13 years ago)
- Location:
- BAORadio/AmasNancay/trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
BAORadio/AmasNancay/trunk/anacalibmaker.sh
r601 r626 121 121 122 122 $ECHO "You have selected sourceRadio = $sourceRadio[date = ${dateSelected}]" 123 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 123 #JEC 14/12/11 One should take care of DR extension for Drift Scan 124 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 125 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 124 126 IFS=' 125 127 ' -
BAORadio/AmasNancay/trunk/anagainmaker.sh
r599 r626 119 119 # 120 120 $ECHO "You have selected sourceRadio = $sourceRadio [date = ${dateSelected}]" 121 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 121 #JEC 14/12/11 One should take care of DR extension for Drift Scan 122 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 123 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 122 124 IFS=' 123 125 ' -
BAORadio/AmasNancay/trunk/analyse.cc
r598 r626 40 40 41 41 //~/private/work/AmasNancay/Objs/analyse -act redMeanONOFF -source Abell85 -date 20110428 -sca sca151675.sum.trans -specdir meancycle -specname mspecmtx -sigmaname sigspecmtx -npaq 25000 -numcycle 1,11 -debug 100 > & redMean.log 42 //./Objs/analyse -act driftScanImg -source NGC4383 -date 20111119 -sca sca157756.sum.trans -inPath /sps/baoradio/AmasNancay/JEC -specdir datacycle -specname medfiltmtx -numcycle 2,2 -debug 100 > & anaimage.log 42 43 43 44 … … 234 235 virtual int processCmd() throw(string); 235 236 }; 237 //------------ 238 //Process ON/OFF Raw data 239 //------------ 240 class ProcessDriftScanRawData : public ProcessBase { 241 242 public: 243 ProcessDriftScanRawData(){} 244 virtual ~ProcessDriftScanRawData(){} 245 246 virtual int processCmd() throw(string); 247 }; 236 248 237 249 … … 362 374 //Init process types 363 375 map<string,IProcess*> process; 364 process["redMedianONOFF"] = new ProcessONOFFReducedMedianData(); //JEC 8/11/11 365 process["redMeanONOFF"] = new ProcessONOFFReducedMeanData(); //JEC 8/11/11 366 process["meanONOFF"] = new ProcessONOFFMeanData(); //JEC 27/10/11 376 process["driftScanImg"] = new ProcessDriftScanRawData(); 377 process["redMedianONOFF"] = new ProcessONOFFReducedMedianData(); 378 process["redMeanONOFF"] = new ProcessONOFFReducedMeanData(); 379 process["meanONOFF"] = new ProcessONOFFMeanData(); 367 380 process["rawOnOff"] = new ProcessONOFFRawData(); 368 381 process["dataOnOff"] = new ProcessONOFFData(); … … 566 579 } 567 580 568 //JEC 22/9/11 Make ON-OFF analysis WO any calibration START569 // try {570 // ProcessONOFFRawData* procRawdata = dynamic_cast<ProcessONOFFRawData*>(process[action]);571 // }572 // catch(exception& e){573 // throw e.what();574 // }575 //JEC 22/9/11 Make ON-OFF analysis WO any calibration END576 581 577 582 //JEC 8/11/11 Start … … 1316 1321 } 1317 1322 //---------------------------------------------- 1318 1319 //JEC 22/9/11 Make ON-OFF analysis WO any calibration START 1323 // JEC 9/12/11 Make an 2D-image of the Drift Scan 1324 //---------------------------------------------- 1325 int ProcessDriftScanRawData::processCmd() throw(string) { 1326 int rc = 0; 1327 try { 1328 rc = ProcessBase::processCmd(); 1329 } 1330 catch (string s) { 1331 throw s; 1332 } 1333 if(debuglev_>0)cout << "Process Drift Scan Raw Data" << endl; 1334 1335 string mode = "On"; //only On data 1336 1337 string directoryName; 1338 list<string> listOfSpecFiles; 1339 list<string>::const_iterator iFile, iFileEnd; 1340 1341 // 1342 //loop on cycles 1343 // 1344 for (sa_size_t icycle = ifirstCycle_; icycle <= ilastCycle_; icycle++) { 1345 directoryName = inputPath_ + "/" 1346 + sourceName_ + "/" + dateOfRun_ + StringToLower(sourceName_) + "/" 1347 + mode + "/"; 1348 stringstream sicycle; 1349 sicycle << icycle; 1350 directoryName += spectraDirectory_ + sicycle.str() + "/"; 1351 1352 //read directory 1353 listOfSpecFiles = ListOfFileInDir(directoryName,typeOfFile_); 1354 1355 //Create a 3D Array: time-like x freq x channel 1356 sa_size_t nfiles = listOfSpecFiles.size(); 1357 TArray<r_4> img(NUMBER_OF_FREQ,NUMBER_OF_CHANNELS,nfiles); //to be conform to TMatrix Default mapping 1358 1359 // cout << "Dump 1" << endl; 1360 // img.Print(cout); 1361 1362 iFileEnd = listOfSpecFiles.end(); 1363 sa_size_t nSpectres = 0; 1364 for (iFile = listOfSpecFiles.begin(); iFile != iFileEnd; ++iFile) { 1365 FitsInOutFile aSpectrum(*iFile,FitsInOutFile::Fits_RO); 1366 TMatrix<r_4> spectre(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ); 1367 aSpectrum >> spectre; 1368 // cout << "Dump 2" << endl; 1369 // spectre.Print(cout); 1370 1371 TMatrix<r_4> imgtmp(img(Range::all(),Range::all(),Range(nSpectres)).CompactAllDimensions()); 1372 // cout << "Dump 3" << endl; 1373 // imgtmp.Print(cout); 1374 1375 imgtmp = spectre; 1376 1377 // cout << "Dump 4" << endl; 1378 // imgtmp.Print(cout); 1379 1380 nSpectres++; 1381 }// end of for files 1382 1383 cout << "Save image " << endl; 1384 string fileName; 1385 fileName = outputPath_ + "/" 1386 // + sourceName_ + "/" + dateOfRun_ + StringToLower(sourceName_) + "/" 1387 + "img_" + dateOfRun_ + "_" + StringToLower(sourceName_) 1388 + "_cycle"+sicycle.str() + ".ppf"; 1389 POutPersist fos(fileName); 1390 string tag = "img" + sicycle.str(); 1391 fos << PPFNameTag(tag) << img; 1392 1393 }//end of cycle loop 1394 1395 cout << "Ok drift finished" << endl; 1396 return rc; 1397 1398 } 1399 //---------------------------------------------- 1400 //Make ON-OFF analysis WO any calibration START 1320 1401 //---------------------------------------------- 1321 1402 int ProcessONOFFRawData::processCmd() throw(string) { -
BAORadio/AmasNancay/trunk/anarawonoffmaker.sh
r601 r626 115 115 116 116 $ECHO "You have selected sourceRadio = ${sourceRadio} [date = ${dateSelected}]" 117 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 117 #JEC 14/12/11 One should take care of DR extension for Drift Scan 118 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 119 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 118 120 IFS=' 119 121 ' -
BAORadio/AmasNancay/trunk/etude_gain.pic
r597 r626 1 set user " AST"1 set user "JEC" 2 2 set toppath "/sps/baoradio/AmasNancay/${user}" 3 set source " Abell1205"4 set srclower " abell1205"5 set date "2011 0924"3 set source "NGC4383" 4 set srclower "ngc4383" 5 set date "20111119" 6 6 set saveplot "1" 7 7 … … 42 42 settitle "Gain monitor $source ${date} Ch 0 (blue) Ch 1 (red)" 43 43 if ( $saveplot == "1" ) then 44 w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps44 # w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps 45 45 endif 46 46 -
BAORadio/AmasNancay/trunk/getAnalyseFiles.sh
r601 r626 99 99 100 100 $ECHO "You have selected sourceRadio = ${sourceRadio} [date = ${dateSelected}]" 101 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 101 #JEC 14/12/11 One should take care of DR extension for Drift Scan 102 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 103 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 102 104 IFS=' 103 105 ' -
BAORadio/AmasNancay/trunk/mergeAnaFiles.cc
r618 r626 1674 1674 1675 1675 }//end save 1676 1677 1678 1676 } 1679 1677 //JEC 14/11/11 New meanRawDiffOnOffCycles END 1680 //-------------------------------------------------------1681 //JEC 14/11/11 Obsolete START1682 //-------------------------------------------------------1683 //Compute the mean of Diff ON-OFF Raw spectra and also the mean/sigma of rebinned spectra1684 //Used like:1685 //1686 // void meanRawDiffOnOffCycles() throw(string) {1687 // list<string> listOfFiles;1688 // string directoryName;1689 // directoryName = para.inPath_ + "/" + para.sourceName_;1690 1691 // //Make the listing of the directory1692 // listOfFiles = ListOfFileInDir(directoryName,para.ppfFile_);1693 1694 // list<string>::const_iterator iFile, iFileEnd, iSpec, iSpecEnd;1695 // iFileEnd = listOfFiles.end();1696 1697 // StringMatch match("specONOFFRaw[0-9]+"); //Tag of the PPF objects1698 // TMatrix<r_4> meanOfSpectra(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);1699 // uint_4 nSpectra=0;1700 // //Loop on files1701 // for (iFile = listOfFiles.begin(); iFile != iFileEnd; ++iFile) {1702 // if (para.debuglev_>90){1703 // cout << "load file <" << *iFile << ">" << endl;1704 // }1705 // PInPersist fin(*iFile);1706 // vector<string> vec = fin.GetNameTags();1707 // list<string> listOfSpectra;1708 // //Keep only required PPF objects1709 // std::remove_copy_if(1710 // vec.begin(), vec.end(), back_inserter(listOfSpectra),1711 // not1(match)1712 // );1713 1714 // listOfSpectra.sort(stringCompare);1715 // iSpecEnd = listOfSpectra.end();1716 // //Loop of spectra matrix1717 // for (iSpec = listOfSpectra.begin(); iSpec !=iSpecEnd; ++iSpec){1718 // if (para.debuglev_>90){1719 // cout << " spactra <" << *iSpec << ">" << endl;1720 // }1721 // TMatrix<r_4> aSpec(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);1722 // fin.GetObject(aSpec,*iSpec);1723 // //How to see if the GetObject is ok?? Ask Reza1724 // nSpectra++;1725 // meanOfSpectra+=aSpec;1726 // }//eo loop on spectra in a file1727 // }//eo loop on files1728 1729 // //Normalisation1730 // if(nSpectra>0)meanOfSpectra/=(r_4)(nSpectra);1731 1732 // //Compute the reduced version of the mean and sigma1733 // TMatrix<r_4> meanRedMtx(NUMBER_OF_CHANNELS,para.nSliceInFreq_);1734 // TMatrix<r_4> sigmaRedMtx(NUMBER_OF_CHANNELS,para.nSliceInFreq_);1735 // reduceSpectra(meanOfSpectra,meanRedMtx,sigmaRedMtx);1736 1737 // {//Save the result1738 // stringstream tmp;1739 // tmp << nSpectra;1740 // string fileName = para.outPath_+"/meanDiffOnOffRaw_"+StringToLower(para.sourceName_)+"-"+tmp.str()+"Cycles.ppf";1741 // cout << "Save mean based on " << nSpectra << " cycles " << endl;1742 // POutPersist fos(fileName);1743 1744 // string tag = "mean";1745 // fos << PPFNameTag(tag) << meanOfSpectra;1746 // tag = "meanred";1747 // fos << PPFNameTag(tag) << meanRedMtx;1748 // tag = "sigmared";1749 // fos << PPFNameTag(tag) << sigmaRedMtx;1750 // }1751 // }1752 //JEC 14/11/11 Obsolete END1753 1678 //------------------------------------------------------- 1754 1679 //Compute the median of Diff ON-OFF Raw spectra and also the mean/sigma of rebinned spectra -
BAORadio/AmasNancay/trunk/mkarchive.sh
r601 r626 111 111 112 112 $ECHO "You have selected sourceRadio = ${sourceRadio} [date = ${dateSelected}]" 113 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 113 #JEC 14/12/11 One should take care of DR extension for Drift Scan 114 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 115 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 114 116 IFS=' 115 117 ' -
BAORadio/AmasNancay/trunk/plotRawDiffOnOff.pic
r611 r626 20 20 nbins1420 = floor((${f1420high}-${f1420low})/250*8192) 21 21 22 set path "/sps/baoradio/AmasNancay/ AST"22 set path "/sps/baoradio/AmasNancay/JEC" 23 23 openppf ${path}/rawOnOffDiff_${source}-${ncycles}Cycles.ppf 24 24 -
BAORadio/AmasNancay/trunk/proc_specmfib.sh
r611 r626 33 33 echo " -<YYYYMMDD-directory> as 20110428" 34 34 echo " -<type of process> as GAIN|CALIBON|CALIBOFF|ON|OFF" 35 echo " as GAINDS|ONDS" 35 36 } 36 37 ###### … … 88 89 89 90 fi 90 #else91 # offtype=`$ECHO ${typeofproc} | $GREP -i OFF | $WC -l`92 # ontype=`$ECHO ${typeofproc} | $GREP -i ON | $WC -l`93 # if [ "<${offtype}>" = "<1>" -a "<${ontype}>" = "<0>" ]; then94 # datatype="OFF"95 # elif [ "<${offtype}>" = "<0>" -a "<${ontype}>" = "<1>" ]; then96 # datatype="ON"97 # else98 # $ECHO "FATAL: not supported: -type ${typeofproc}"99 # exit 1100 # fi101 #fi102 91 103 92 … … 273 262 lastp1CycleId=`expr ${firstCycleId} + 1` 274 263 ;; 264 GAINDS) 265 $ECHO "process signal files for GAIN DRIFT SCAN phases" 266 ingain="" 267 freqfilter="-freqfilter -" 268 nwinmean="1" 269 tspwin="5120" 270 dirName="Off" 271 cyclebasename="gaincycle" 272 indexStartHour="2" 273 timeShift="-4" 274 timeDuration="14" 275 firstCycleId=`expr ${#cycleArray[*]} / 2` 276 firstCycleId=`expr ${firstCycleId} - 1` 277 lastp1CycleId=`expr ${firstCycleId} + 1` 278 ;; 275 279 GAINNF) 276 280 $ECHO "process signal files for GAIN phase wo Freq FILTERING" … … 299 303 timeShift="3" 300 304 timeDuration="30" 305 firstCycleId="0" 306 lastp1CycleId="${#cycleArray[@]}" 307 ;; 308 ONDS) 309 $ECHO "process signal files for ON Drift Scan phases" 310 ingain="-gain gain_${dateSelected}_${srclower}.fits" 311 freqfilter="" 312 nwinmean="5" 313 tspwin="5120" 314 dirName="On" 315 cyclebasename="datacycle" 316 indexStartHour="4" 317 timeShift="3" 318 timeDuration="170" 301 319 firstCycleId="0" 302 320 lastp1CycleId="${#cycleArray[@]}" … … 457 475 #write the script to be send to Batch 458 476 #get gain file if necessary 459 if [ ${typeofproc} != "GAIN" ]; then477 if [ ${typeofproc} != "GAIN" -a ${typeofproc} != "GAINDS" ]; then 460 478 OUT2=./igetStatus.$$ 461 479 iget /baoradio/data/AmasNancay/${localpath}/gain_${dateSelected}_${srclower}.fits >${OUT2} 2>&1 … … 526 544 #get signals files 527 545 OUT3=./getsignals.$$ 528 #JEC 29/9/11 avoid finished stuff529 # $RM -f ${tmppublicpath}/getsignalfiles.finished530 546 ${scriptpath}/getsignalfiles.sh ${sourceRadio} ${dateSelected} ${firstFile} ${lastFile} > ${OUT3} 2>&1 531 # while [ ! -f "${tmppublicpath}/getsignalfiles.finished" ]; do532 # $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getsignalfiles.finished"533 # date +%T534 # sleep 30535 # done536 # $RM ${tmppublicpath}/getsignalfiles.finished537 538 547 getSignals=`$GREP "^FATAL" ${OUT3}` 539 548 if [ "<$getSignals>" != "<>" ]; then -
BAORadio/AmasNancay/trunk/rawonoffmaker.sh
r601 r626 102 102 103 103 #get the daq current irod status 104 #tag=`${DATE} +%F`105 #OUT1=${publicpath}/baodaqstatus-${tag}.txt106 ####JEC 1/10/11 tag=`${DATE} +%F`107 #Use generic baodaqstatus name108 104 OUT1=${publicpath}/baodaqstatus-current.txt 109 105 … … 111 107 $ECHO "FATAL (${scriptName}): ${OUT1} has a problem" 112 108 exit 1 113 #JEC 29/9/11 avoid finished stuff114 # $RM -f ${tmppublicpath}/statusdaq.finished115 # ${scriptpath}/statusdaq.sh > ${OUT1}116 # while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do117 # sleep 30118 # done119 # $RM ${tmppublicpath}/statusdaq.finished120 #protect against remove/rewriting121 # $CHMOD -v 444 ${OUT1}122 109 fi 123 110 … … 128 115 129 116 $ECHO "You have selected sourceRadio = ${sourceRadio} [date = ${dateSelected}]" 130 tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 117 #JEC 14/12/11 One should take care of DR extension for Drift Scan 118 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 119 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 131 120 IFS=' 132 121 ' … … 148 137 $LS -lrt 149 138 150 #JEC 1/10/11 Use generic baodaqstatus name151 #Look if the date has changed since beginning of the job!152 # curtag=`${DATE} +%F`153 # if [ "<${curtag}>" != "<${tag}>" ]; then154 # tag=${curtag}155 #it is necessary to update the daq status as the day has changed during the processing... (batch can take a long time...)156 # OUT1=${publicpath}/baodaqstatus-${curtag}.txt157 # $ECHO "We should bring the DAQ status more up to date, this take 1 or 2sec..."158 # $RM -f ${tmppublicpath}/statusdaq.finished159 # ${scriptpath}/statusdaq.sh > ${OUT1}160 # while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do161 # sleep 30162 # done163 # $RM ${tmppublicpath}/statusdaq.finished164 #protect against remove/rewriting165 # $CHMOD -v 444 ${OUT1}166 # fi167 139 # 168 140 # look if the gain & calibration files exist -
BAORadio/AmasNancay/trunk/scaextractor.sh
r579 r626 11 11 RM=/bin/rm 12 12 LS=/bin/ls 13 TR=/usr/bin/tr 13 14 DefaultIFS=$' \t\n' 14 15 IFS=$DefaultIFS … … 21 22 $ECHO "Processing script ${scriptName} at `date`" 22 23 24 #Process cmd line args: the -src option is mandatory (source name as Abell85) 25 sourceRadio= 26 dateSelected= 27 #force recomputation force=Yes 28 force="No" 29 #use Drift Scan script=Yes 30 is4DriftScan="No" 31 while [ $# -gt 0 ] 32 do 33 case "$1" in 34 -src) sourceRadio=$2; shift;; 35 -date) dateSelected=$2; shift;; 36 -force) force="Yes"; shift;; 37 -drift) is4DriftScan="Yes"; shift;; 38 -h) 39 echo >&2 \ 40 "usage: $0 -src souce -date YYYYMMDD [-force] [-drift]" 41 exit 1;; 42 *) break;; # terminate while loop 43 esac 44 shift 45 done 46 47 23 48 #which source to analyse 24 s ourceRadio=$149 srclower=`${ECHO} ${sourceRadio} | ${TR} "[:upper:]" "[:lower:]" ` 25 50 26 #force recomputation force=Yes27 force=$228 51 29 52 #Path to public backupable path … … 51 74 52 75 #JEC 1/10/11 Use generic baodaqstatus name 53 #get the daq current irod status54 #tag=`${DATE} +%F`55 #OUT1=${publicpath}/baodaqstatus-${tag}.txt56 76 OUT1=${publicpath}/baodaqstatus-current.txt 57 77 … … 63 83 64 84 if [ ! "<${sourceRadio}>" = "<>" ]; then 65 $ECHO "You have selected sourceRadio = $sourceRadio" 66 tableau=( `$GREP -i ${sourceRadio} ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 85 $ECHO "You have selected sourceRadio = $sourceRadio[date = ${dateSelected}]" 86 #JEC 14/12/11 One should take care of DR extension for Drift Scan 87 #tableau=( `$GREP -i "${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 88 tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` ) 67 89 else 68 90 tableau=( `$CAT ${OUT1} | $AWK'( NF==4 ) { print $2 }'` ) … … 94 116 iget -r -f -v -K ${i}/${scafile} ${iojobpath} 95 117 #extract summary (sum extension) 96 #JEC 29/9/11 avoid finished stuff 97 $RM -f ${tmppublicpath}/sca.finished 98 ${scriptpath}/sca.sh ${scafile} 99 # while [ ! -e "${tmppublicpath}/sca.finished" ]; do 100 # $ECHO "INFO (${scriptName}); waiting for ${tmppublicpath}/sca.finished" 101 # date +%T 102 # sleep 30 103 # done 104 $ECHO "INFO (${scriptName}): sca.sh has finished" 105 # $RM ${tmppublicpath}/sca.finished 118 #JEC 7/12/11 START 119 if [ "<${is4DriftScan}>" != "<Yes>" ]; then 120 ${scriptpath}/sca.sh ${scafile} 121 $ECHO "INFO (${scriptName}): sca.sh has finished" 122 else 123 ${scriptpath}/sca_ds.sh ${scafile} 124 $ECHO "INFO (${scriptName}): sca_ds.sh has finished" 125 fi 126 # 106 127 #TODO see if there is errors... 107 128 scaFileName=$(basename $scafile) 108 129 scaFileName=${scaFileName%.*} 109 130 #transform the date (sum.trans extension) 110 #JEC 29/9/11 avoid finished stuff111 # $RM -f ${tmppublicpath}/transdate.finished112 131 ${scriptpath}/transdate.sh ${scaFileName}.sum 113 # while [ ! -e "${tmppublicpath}/transdate.finished" ]; do114 # $ECHO "INFO (${scriptName}); waiting for ${tmppublicpath}/transdate.finished"115 # date +%T116 # sleep 30117 # done118 132 $ECHO "INFO (${scriptName}): transdate.sh has finished" 119 # $RM ${tmppublicpath}/transdate.finished120 #TODO see if there is errors...121 #put back into Irod122 # $ECHO "INFO (${scriptName}): where am i: `pwd`"123 # $LS -lrt124 # $ECHO "INFO (${scriptName}): see up directory"125 # $LS -lrt ..126 133 iput -f -v -K ${iojobpath}/${scaFileName}.sum $i 127 134 iput -f -v -K ${iojobpath}/${scaFileName}.sum.trans $i -
BAORadio/AmasNancay/trunk/select.sh
r590 r626 57 57 ON) 58 58 $ECHO "INFO (${scriptName}): filter signal files for ON phases";; 59 ONDS) 60 $ECHO "INFO (${scriptName}): filter signal files for ON Drift Scan phases";; 59 61 OFF) 60 62 $ECHO "INFO (${scriptName}): filter signal files for OFF phases";; … … 71 73 GAINNF) 72 74 $ECHO "INFO (${scriptName}): filter signal files for GAINNF = GAIN wo filt. freq.";; 75 GAINDS) 76 $ECHO "INFO (${scriptName}): filter signal files for GAINDS = GAIN for Drift Scan";; 73 77 *) 74 78 $ECHO "FATAL (${scriptName}): use ON|OFF|MEANON|MEANOFF|CALIBON|CALIBOFF phase tags." … … 144 148 cycle=$1; 145 149 146 if ( (type == "ON") || (type == "MEANON" ) ) {150 if ( (type == "ON") || (type == "MEANON" || (type == "ONDS")) ) { 147 151 phaseStart=$4; phaseEnd=$5; 148 152 cmd=sprintf("%s +%%s -d \"%s\" ",datesys,phaseStart); … … 168 172 deltaEndSafety=-4; 169 173 } 170 else if ( type == "CALIBON") {174 else if ( (type == "CALIBON") || (type == "GAINDS") ) { 171 175 phaseStart=$2; phaseEnd=$3; 172 176 print "Phase: ",type," cycle: ",cycle,": <",phaseStart,">:<",phaseEnd,">"; -
BAORadio/AmasNancay/trunk/submit2ge-procspecmfib.sh
r598 r626 38 38 #use -sim option to simulate processing (debug the script as if...) 39 39 simulationMode="" 40 #drift scan option 41 dscan="No" 40 42 while [ $# -gt 0 ] 41 43 do … … 47 49 -fcycle) firstCycle="-fcycle $2"; fcycle="$2"; shift;; 48 50 -lcycle) lastCycle="-lcycle $2"; lcycle="$2"; shift;; 51 -dscan) dscan="Yes"; shift;; 49 52 -sim) 50 53 simulationMode="-sim On" … … 101 104 #assume 2*10 files/cycles cf. 30sec/cycle et 3sec par signal et fact 2 margin 102 105 # Test: assume for Abell1205, aout2011, 2*20 files 103 guessFiles=40 106 if [ "<$dscan>" != "<Yes>" ]; then 107 guessFiles=40 108 else 109 guessFiles=150 110 fi 111 104 112 if [ "<${firstCycle}>" != "<>" -a "<${lastCycle}>" != "<>" ]; then 105 113 jobBatchName="procspecmfib-${sourceRadio}${dateJob}${type}-${fcycle}-${lcycle}" -
BAORadio/AmasNancay/trunk/submit2ge-scaextractor.sh
r598 r626 19 19 #Process cmd line args: the -src option is mandatory (source name as Abell85) 20 20 sourceRadio= 21 dateSelect= 21 22 force= 23 forDriftScan= 24 22 25 while [ $# -gt 0 ] 23 do26 do 24 27 case "$1" in 25 28 -src) sourceRadio=$2; shift;; 26 -force) force="Yes";; 27 -h) 28 echo >&2 \ 29 "usage: $0 -src souce" 29 -date) dateSelect=$2; shift;; 30 -force) force="-force"; shift;; 31 -drift) forDriftScan="-drift"; shift;; 32 -h) 33 echo >&2 \ 34 "usage: $0 -src source -date YYYYMMDD [-force] [-drift]" 30 35 exit 1;; 31 36 *) break;; # terminate while loop … … 59 64 jobLogName="${jobBatchName}.log.$$" 60 65 61 qsub -P P_baoradio -l sps=1,irods=1,ct= 2000,vmem=256M,fsize=700M -o ${PWD}/${jobLogName} -j yes -N $jobBatchName -m be -M ${LOGNAME}@lal.in2p3.fr -V <<EOF66 qsub -P P_baoradio -l sps=1,irods=1,ct=100,vmem=256M,fsize=70M -o ${PWD}/${jobLogName} -j yes -N $jobBatchName -m be -M ${LOGNAME}@lal.in2p3.fr -V <<EOF 62 67 63 ${SCRIPTPATH}/scaextractor.sh ${sourceRadio} ${force}68 ${SCRIPTPATH}/scaextractor.sh -src ${sourceRadio} -date ${dateSelect} ${force} ${forDriftScan} 64 69 EOF
Note: See TracChangeset
for help on using the changeset viewer.