Changeset 626


Ignore:
Timestamp:
Dec 14, 2011, 11:23:44 AM (13 years ago)
Author:
campagne
Message:

drift scan runs (jec)

Location:
BAORadio/AmasNancay/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • BAORadio/AmasNancay/trunk/anacalibmaker.sh

    r601 r626  
    121121
    122122$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 }' ` )
     125tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    124126IFS='
    125127'

  • BAORadio/AmasNancay/trunk/anagainmaker.sh

    r599 r626  
    119119#
    120120$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 }' ` )
     123tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    122124IFS='
    123125'

  • BAORadio/AmasNancay/trunk/analyse.cc

    r598 r626  
    4040
    4141//~/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
    4243
    4344
    … …  
    234235  virtual int processCmd() throw(string);
    235236};
     237//------------
     238//Process ON/OFF Raw data
     239//------------
     240class ProcessDriftScanRawData : public ProcessBase {
     241
     242public:
     243  ProcessDriftScanRawData(){}
     244  virtual ~ProcessDriftScanRawData(){}
     245 
     246  virtual int processCmd() throw(string);
     247};
    236248
    237249
    … …  
    362374  //Init process types
    363375  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();
    367380  process["rawOnOff"]  = new ProcessONOFFRawData(); 
    368381  process["dataOnOff"] = new ProcessONOFFData();
    … …  
    566579    }
    567580
    568     //JEC 22/9/11 Make ON-OFF analysis WO any calibration START
    569 //     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 END
    576581
    577582    //JEC 8/11/11 Start
    … …  
    13161321}
    13171322//----------------------------------------------
    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//----------------------------------------------
     1325int 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
    13201401//----------------------------------------------
    13211402int ProcessONOFFRawData::processCmd() throw(string) {

  • BAORadio/AmasNancay/trunk/anarawonoffmaker.sh

    r601 r626  
    115115
    116116$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 }' ` )
     119tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    118120IFS='
    119121'

  • BAORadio/AmasNancay/trunk/etude_gain.pic

    r597 r626  
    1 set user "AST"
     1set user "JEC"
    22set toppath "/sps/baoradio/AmasNancay/${user}"
    3 set source "Abell1205"
    4 set srclower "abell1205"
    5 set date   "20110924"
     3set source "NGC4383"
     4set srclower "ngc4383"
     5set date   "20111119"
    66set saveplot "1"
    77
    … …  
    4242settitle "Gain monitor $source ${date} Ch 0 (blue) Ch 1 (red)"
    4343if ( $saveplot == "1" ) then
    44   w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps
     44#  w2eps ${toppath}/${source}/eps/gain/gain_monitor_${date}_${srclower}.eps
    4545endif
    4646

  • BAORadio/AmasNancay/trunk/getAnalyseFiles.sh

    r601 r626  
    9999
    100100$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 }' ` )
     103tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    102104IFS='
    103105'

  • BAORadio/AmasNancay/trunk/mergeAnaFiles.cc

    r618 r626  
    16741674
    16751675  }//end save
    1676 
    1677 
    16781676}
    16791677//JEC 14/11/11 New meanRawDiffOnOffCycles END
    1680 //-------------------------------------------------------
    1681 //JEC 14/11/11 Obsolete START
    1682 //-------------------------------------------------------
    1683 //Compute the mean of Diff ON-OFF Raw spectra and also the mean/sigma of rebinned spectra
    1684 //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 directory
    1692 //   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 objects
    1698 //   TMatrix<r_4> meanOfSpectra(NUMBER_OF_CHANNELS,NUMBER_OF_FREQ);
    1699 //   uint_4 nSpectra=0;
    1700 //   //Loop on files
    1701 //   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 objects
    1709 //     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 matrix
    1717 //     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 Reza
    1724 //       nSpectra++;
    1725 //       meanOfSpectra+=aSpec;
    1726 //     }//eo loop on spectra in a file
    1727 //   }//eo loop on files
    1728  
    1729 //   //Normalisation
    1730 //   if(nSpectra>0)meanOfSpectra/=(r_4)(nSpectra);
    1731 
    1732 //   //Compute the reduced version of the mean and sigma
    1733 //   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 result
    1738 //     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 END
    17531678//-------------------------------------------------------
    17541679//Compute the median of Diff ON-OFF Raw spectra and also the mean/sigma of rebinned spectra

  • BAORadio/AmasNancay/trunk/mkarchive.sh

    r601 r626  
    111111
    112112$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 }' ` )
     115tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    114116IFS='
    115117'

  • BAORadio/AmasNancay/trunk/plotRawDiffOnOff.pic

    r611 r626  
    2020nbins1420 = floor((${f1420high}-${f1420low})/250*8192)
    2121
    22 set path "/sps/baoradio/AmasNancay/AST"
     22set path "/sps/baoradio/AmasNancay/JEC"
    2323openppf ${path}/rawOnOffDiff_${source}-${ncycles}Cycles.ppf
    2424

  • BAORadio/AmasNancay/trunk/proc_specmfib.sh

    r611 r626  
    3333  echo "      -<YYYYMMDD-directory> as 20110428"
    3434  echo "      -<type of process> as GAIN|CALIBON|CALIBOFF|ON|OFF"
     35  echo "                         as GAINDS|ONDS"
    3536}
    3637######
    … …  
    8889
    8990fi
    90 #else
    91 #    offtype=`$ECHO ${typeofproc} | $GREP -i OFF | $WC -l`
    92 #    ontype=`$ECHO ${typeofproc} | $GREP -i ON | $WC -l`
    93 #    if [ "<${offtype}>" = "<1>" -a  "<${ontype}>" = "<0>" ]; then
    94 #       datatype="OFF"
    95 #    elif [ "<${offtype}>" = "<0>" -a  "<${ontype}>" = "<1>" ]; then
    96 #       datatype="ON"
    97 #    else
    98 #       $ECHO "FATAL: not supported: -type ${typeofproc}"
    99 #       exit 1
    100 #    fi
    101 #fi
    10291
    10392
    … …  
    273262      lastp1CycleId=`expr ${firstCycleId} + 1`
    274263      ;;
     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      ;;
    275279    GAINNF)
    276280      $ECHO "process signal files for GAIN phase wo Freq FILTERING"
    … …  
    299303      timeShift="3"
    300304      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"
    301319      firstCycleId="0"
    302320      lastp1CycleId="${#cycleArray[@]}"
    … …  
    457475#write the script to be send to Batch
    458476#get gain file if necessary
    459 if [ ${typeofproc} != "GAIN" ]; then
     477if [ ${typeofproc} != "GAIN" -a ${typeofproc} != "GAINDS" ]; then
    460478    OUT2=./igetStatus.$$
    461479    iget /baoradio/data/AmasNancay/${localpath}/gain_${dateSelected}_${srclower}.fits >${OUT2} 2>&1
    … …  
    526544#get signals files
    527545    OUT3=./getsignals.$$
    528 #JEC 29/9/11 avoid finished stuff
    529 #    $RM -f ${tmppublicpath}/getsignalfiles.finished
    530546    ${scriptpath}/getsignalfiles.sh ${sourceRadio} ${dateSelected} ${firstFile}  ${lastFile} > ${OUT3} 2>&1
    531 #    while [ ! -f "${tmppublicpath}/getsignalfiles.finished" ]; do
    532 #       $ECHO "INFO (${scriptName}): waiting for ${tmppublicpath}/getsignalfiles.finished"
    533 #       date +%T
    534 #       sleep 30
    535 #    done
    536 #    $RM ${tmppublicpath}/getsignalfiles.finished
    537 
    538547    getSignals=`$GREP "^FATAL" ${OUT3}`
    539548    if [ "<$getSignals>" != "<>" ]; then

  • BAORadio/AmasNancay/trunk/rawonoffmaker.sh

    r601 r626  
    102102
    103103#get the daq current irod status
    104 #tag=`${DATE} +%F`
    105 #OUT1=${publicpath}/baodaqstatus-${tag}.txt
    106 ####JEC 1/10/11 tag=`${DATE} +%F`
    107 #Use generic baodaqstatus name
    108104OUT1=${publicpath}/baodaqstatus-current.txt
    109105
    … …  
    111107    $ECHO "FATAL (${scriptName}): ${OUT1} has a problem"
    112108    exit 1
    113 #JEC 29/9/11 avoid finished stuff
    114 #    $RM -f ${tmppublicpath}/statusdaq.finished
    115 #    ${scriptpath}/statusdaq.sh > ${OUT1}
    116 #    while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do
    117 #       sleep 30
    118 #    done
    119 #    $RM ${tmppublicpath}/statusdaq.finished
    120 #protect against remove/rewriting   
    121 #    $CHMOD -v 444 ${OUT1}
    122109fi
    123110
    … …  
    128115
    129116$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 }' ` )
     119tableau=( `$GREP -i "${sourceRadio}/${dateSelected}${srclower}" ${OUT1} | $AWK '( NF==4 ) { print $2 }' ` )
    131120IFS='
    132121'
    … …  
    148137  $LS -lrt
    149138
    150 #JEC 1/10/11 Use generic baodaqstatus name
    151 #Look if the date has changed since beginning of the job!
    152 #  curtag=`${DATE} +%F`
    153 #  if [ "<${curtag}>" != "<${tag}>" ]; then
    154 #      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}.txt
    157 #     $ECHO "We should bring the DAQ status more up to date, this take 1 or 2sec..."
    158 #      $RM -f ${tmppublicpath}/statusdaq.finished
    159 #      ${scriptpath}/statusdaq.sh > ${OUT1}
    160 #      while [ ! -f "${tmppublicpath}/statusdaq.finished" ]; do
    161 #         sleep 30
    162 #      done
    163 #      $RM ${tmppublicpath}/statusdaq.finished
    164 #protect against remove/rewriting   
    165 #      $CHMOD -v 444 ${OUT1}
    166 #  fi
    167139#
    168140# look if the gain & calibration files exist

  • BAORadio/AmasNancay/trunk/scaextractor.sh

    r579 r626  
    1111RM=/bin/rm
    1212LS=/bin/ls
     13TR=/usr/bin/tr
    1314DefaultIFS=$' \t\n'
    1415IFS=$DefaultIFS
    … …  
    2122$ECHO "Processing script ${scriptName} at `date`"
    2223
     24#Process cmd line args: the -src option is mandatory (source name as Abell85)
     25sourceRadio=
     26dateSelected=
     27#force recomputation force=Yes
     28force="No"
     29#use Drift Scan script=Yes
     30is4DriftScan="No"
     31while [ $# -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
     45done
     46
     47
    2348#which source to analyse
    24 sourceRadio=$1
     49srclower=`${ECHO} ${sourceRadio} | ${TR} "[:upper:]" "[:lower:]" `
    2550
    26 #force recomputation force=Yes
    27 force=$2
    2851
    2952#Path to public backupable path
    … …  
    5174
    5275#JEC 1/10/11 Use generic baodaqstatus name
    53 #get the daq current irod status
    54 #tag=`${DATE} +%F`
    55 #OUT1=${publicpath}/baodaqstatus-${tag}.txt
    5676OUT1=${publicpath}/baodaqstatus-current.txt
    5777
    … …  
    6383
    6484if [ ! "<${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 }' ` )
    6789else
    6890    tableau=( `$CAT ${OUT1} | $AWK'( NF==4 ) { print $2 }'`  )
    … …  
    94116        iget -r -f -v -K ${i}/${scafile} ${iojobpath}
    95117#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#
    106127#TODO see if there is errors...
    107128        scaFileName=$(basename $scafile)
    108129        scaFileName=${scaFileName%.*}
    109130#transform the date (sum.trans extension)
    110 #JEC 29/9/11 avoid finished stuff
    111 #       $RM -f ${tmppublicpath}/transdate.finished
    112131        ${scriptpath}/transdate.sh ${scaFileName}.sum
    113 #       while [ ! -e "${tmppublicpath}/transdate.finished" ]; do
    114 #           $ECHO "INFO (${scriptName}); waiting for ${tmppublicpath}/transdate.finished"
    115 #           date +%T
    116 #           sleep 30
    117 #       done
    118132        $ECHO "INFO (${scriptName}): transdate.sh  has finished"
    119 #       $RM ${tmppublicpath}/transdate.finished
    120 #TODO see if there is errors...
    121 #put back into Irod
    122 #       $ECHO "INFO (${scriptName}): where am i: `pwd`"
    123 #       $LS -lrt
    124 #       $ECHO "INFO (${scriptName}): see up directory"
    125 #       $LS -lrt ..
    126133        iput -f -v -K ${iojobpath}/${scaFileName}.sum $i
    127134        iput -f -v -K ${iojobpath}/${scaFileName}.sum.trans $i

  • BAORadio/AmasNancay/trunk/select.sh

    r590 r626  
    5757    ON)
    5858    $ECHO "INFO (${scriptName}): filter signal files for ON phases";;
     59    ONDS)
     60    $ECHO "INFO (${scriptName}): filter signal files for ON Drift Scan phases";;
    5961    OFF)
    6062    $ECHO "INFO (${scriptName}): filter signal files for OFF phases";;
    … …  
    7173    GAINNF)
    7274    $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";;
    7377    *)
    7478    $ECHO "FATAL (${scriptName}): use ON|OFF|MEANON|MEANOFF|CALIBON|CALIBOFF phase tags."
    … …  
    144148  cycle=$1;
    145149
    146   if ( (type == "ON") || (type == "MEANON") ) {
     150  if ( (type == "ON") || (type == "MEANON" || (type == "ONDS")) ) {
    147151    phaseStart=$4; phaseEnd=$5;
    148152    cmd=sprintf("%s +%%s -d \"%s\" ",datesys,phaseStart);
    … …  
    168172    deltaEndSafety=-4;
    169173  }
    170   else if ( type == "CALIBON" ) {
     174  else if ( (type == "CALIBON") || (type == "GAINDS") ) {
    171175    phaseStart=$2; phaseEnd=$3;
    172176    print "Phase: ",type," cycle: ",cycle,": <",phaseStart,">:<",phaseEnd,">";

  • BAORadio/AmasNancay/trunk/submit2ge-procspecmfib.sh

    r598 r626  
    3838#use -sim option to simulate processing (debug the script as if...)
    3939simulationMode=""
     40#drift scan option
     41dscan="No"
    4042while [ $# -gt 0 ]
    4143do
    … …  
    4749      -fcycle) firstCycle="-fcycle $2"; fcycle="$2"; shift;;
    4850      -lcycle) lastCycle="-lcycle $2"; lcycle="$2"; shift;;
     51      -dscan) dscan="Yes"; shift;;
    4952       -sim)
    5053      simulationMode="-sim On"
    … …  
    101104#assume 2*10 files/cycles cf. 30sec/cycle et 3sec par signal et fact 2 margin
    102105# Test: assume for Abell1205, aout2011, 2*20 files
    103 guessFiles=40
     106if [ "<$dscan>" != "<Yes>" ]; then
     107    guessFiles=40
     108else
     109    guessFiles=150
     110fi
     111
    104112if [ "<${firstCycle}>" != "<>" -a "<${lastCycle}>" != "<>" ]; then
    105113    jobBatchName="procspecmfib-${sourceRadio}${dateJob}${type}-${fcycle}-${lcycle}"

  • BAORadio/AmasNancay/trunk/submit2ge-scaextractor.sh

    r598 r626  
    1919#Process cmd line args: the -src option is mandatory (source name as Abell85)
    2020sourceRadio=
     21dateSelect=
    2122force=
     23forDriftScan=
     24
    2225while [ $# -gt 0 ]
    23 do
     26  do
    2427  case "$1" in
    2528      -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]"
    3035            exit 1;;
    3136        *)  break;;     # terminate while loop
    … …  
    5964jobLogName="${jobBatchName}.log.$$"
    6065
    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 <<EOF
     66qsub -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
    6267
    63 ${SCRIPTPATH}/scaextractor.sh  ${sourceRadio} ${force}
     68${SCRIPTPATH}/scaextractor.sh  -src ${sourceRadio} -date ${dateSelect} ${force} ${forDriftScan}
    6469EOF
Note: See TracChangeset for help on using the changeset viewer.