Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 7211) +++ trunk/MagicSoft/Mars/Changelog (revision 7212) @@ -20,4 +20,19 @@ -*-*- END OF LINE -*-*- + 2005/07/12 Daniela Dorner + + * sinope.cc: + - added option to select only data or only calibration events for + the datacheck + + * datacenter/scripts/runstar, runcallisto: + - increased number of processes to ensure, that the runtime of a + process doesn't exeed 12 hours + + * datacenter/scripts/runganymed: + - removed second execution of ganymed + + + 2005/07/22 Thomas Bretz Index: trunk/MagicSoft/Mars/datacenter/scripts/runcallisto =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/runcallisto (revision 7211) +++ trunk/MagicSoft/Mars/datacenter/scripts/runcallisto (revision 7212) @@ -38,5 +38,5 @@ datetime=`date +%F-%H-%M-%S` year=`date +%Y` -pno=24 # number of processes, i.e. number of todo-files +pno=500 # number of processes, i.e. number of todo-files todofile=$listpath/ToDo-$table-$column Index: trunk/MagicSoft/Mars/datacenter/scripts/runganymed =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/runganymed (revision 7211) +++ trunk/MagicSoft/Mars/datacenter/scripts/runganymed (revision 7212) @@ -190,37 +190,28 @@ mode="onoff" >> $scriptlog 2>&1 fi - ganymedrc=/magic/datacenter/setup/ganymed/ganymed_$mode + ganymedrc=/magic/datacenter/setup/ganymed/ganymed_$mode.rc echo "run ganymed..." >> $scriptlog 2>&1 - ./ganymed -b -q -v4 -f --sum --config=$ganymedrc.rc --log=$outpath/ganymed$no2.log --html=$outpath/ganymed$no2.html --out=$outpath $datasetfile 2>> $scriptlog> /dev/null + ./ganymed -b -q -v4 -f --sum --config=$ganymedrc --log=$outpath/ganymed$no2.log --html=$outpath/ganymed$no2.html --out=$outpath $datasetfile 2>> $scriptlog> /dev/null check1=$? case $check1 in 0) echo "check1=$check1 -> everthing ok " >> $scriptlog 2>&1 - echo "-> do ganymed a second time " >> $scriptlog 2>&1 - ./ganymed -b -q -v4 -f --skip-res --config=$ganymedrc-fs.rc --log=$outpath/ganymed$no2-fs.log --html=$outpath/ganymed$no2-fs.html --out=$outpath --outf=ganymed$no2-fs.root $datasetfile 2>> $scriptlog> /dev/null - check2=$? - - case $check2 in - 0) echo "check2=$check2 -> everthing ok " >> $scriptlog 2>&1 - echo "-> inserting the status for ganymed for dataset $dataset into the db" >> $scriptlog 2>&1 - setstatuslogpath=$logpath/setstatus/ganymed/$no - if [ ! -d $setstatuslogpath ] - then - mkdir -pv $setstatuslogpath >> $scriptlog 2>&1 - if [ ! -d $setstatuslogpath ] - then - echo "could not make setstatuslogpath "$setstatuslogpath >> $scriptlog 2>&1 - continue - fi - fi - setstatuslog=$setstatuslogpath/setstatus-ganymed-$no2.log - check4=`root -q -b $macrospath/setstatus.C+\("\"$dataset\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'` - case $check4 in - 1) echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;; - *) echo "check4=$check4 -> ERROR -> step could not be set" >> $scriptlog 2>&1;; - esac - ;; - *) echo "check2=$check2 -> ERROR -> step has to be repeated" >> $scriptlog 2>&1;; + echo "-> inserting the status for ganymed for dataset $dataset into the db" >> $scriptlog 2>&1 + setstatuslogpath=$logpath/setstatus/ganymed/$no + if [ ! -d $setstatuslogpath ] + then + mkdir -pv $setstatuslogpath >> $scriptlog 2>&1 + if [ ! -d $setstatuslogpath ] + then + echo "could not make setstatuslogpath "$setstatuslogpath >> $scriptlog 2>&1 + continue + fi + fi + setstatuslog=$setstatuslogpath/setstatus-ganymed-$no2.log + check4=`root -q -b $macrospath/setstatus.C+\("\"$dataset\""\,"\"$table\""\,"\"$column\""\,"\"Now()\""\) | tee $setstatuslog | grep int | sed -e 's/(int)//'` + case $check4 in + 1) echo "check4=$check4 -> everthing ok, status has been set" >> $scriptlog 2>&1;; + *) echo "check4=$check4 -> ERROR -> step could not be set" >> $scriptlog 2>&1;; esac ;; Index: trunk/MagicSoft/Mars/datacenter/scripts/runstar =================================================================== --- trunk/MagicSoft/Mars/datacenter/scripts/runstar (revision 7211) +++ trunk/MagicSoft/Mars/datacenter/scripts/runstar (revision 7212) @@ -36,5 +36,5 @@ datetime=`date +%F-%H-%M-%S` year=`date +%Y` -pno=24 # number of processes, i.e. number of todo-files +pno=500 # number of processes, i.e. number of todo-files todofile=$listpath/ToDo-$table-$column Index: trunk/MagicSoft/Mars/sinope.cc =================================================================== --- trunk/MagicSoft/Mars/sinope.cc (revision 7211) +++ trunk/MagicSoft/Mars/sinope.cc (revision 7212) @@ -16,4 +16,7 @@ #include "MRawFileRead.h" #include "MArrayD.h" +#include "MFTriggerPattern.h" +#include "MTriggerPatternDecode.h" +#include "MContinue.h" #include "MTaskInteractive.h" #include "MLog.h" @@ -212,4 +215,6 @@ gLog << " -q Quit when job is finished" << endl; gLog << " -f Force overwrite of existing files" << endl; + gLog << " -dat Run sinope only for data events in the run" << endl; + gLog << " -cal Run sinope only for calibration events in the run" << endl; gLog << " --ind=path Path where to search for the data file" << endl; gLog << " [default=standard path in datacenter]" << endl; @@ -278,4 +283,6 @@ const Bool_t kBatch = arg.HasOnlyAndRemove("-b"); const Bool_t kOverwrite = arg.HasOnlyAndRemove("-f"); + const Bool_t kData = arg.HasOnlyAndRemove("-dat"); + const Bool_t kCal = arg.HasOnlyAndRemove("-cal"); //const Bool_t kForceExec = arg.HasOnlyAndRemove("-ff"); @@ -283,5 +290,5 @@ /*const TString*/ kOutpath = arg.GetStringAndRemove("--out=", ""); - const Int_t kNumEvents = arg.GetIntAndRemove("--num=", 1000); + const Int_t kNumEvents = arg.GetIntAndRemove("--num=", header.GetNumEvents()); const Int_t kRunNumber = arg.GetIntAndRemove("--run=", -1); const TString kDate = arg.GetStringAndRemove("--date=", ""); @@ -401,4 +408,18 @@ MTaskInteractive task; + MTriggerPatternDecode decode; + MFTriggerPattern ftp; + if (kCal || kData) + { + ftp.SetDefault(kTRUE); + ftp.DenyCalibration(); + if (!kCal) + { + ftp.DenyPedestal(); + ftp.SetInverted(); + } + } + MContinue conttp(&ftp, "ContTrigPattern"); + task.SetPreProcess(PreProcess); task.SetProcess(Process); @@ -407,4 +428,9 @@ MTaskList tlist; tlist.AddToList(&read); + if (kCal || kData) + { + tlist.AddToList(&decode); + tlist.AddToList(&conttp); + } tlist.AddToList(&task);