Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 6603) +++ trunk/MagicSoft/Mars/Changelog (revision 6604) @@ -29,4 +29,5 @@ + 2005/02/18 Thomas Bretz @@ -40,4 +41,23 @@ - added Add*Runs member function - with this changes MSequence can replace MRunIter now + - allow requesting of standard path from outside + (GetStandardPath) + + * Makefile: + - added sinope + + * sinope.cc: + - added (small tool to check contents of run for datacenter) + + * callisto.cc: + - added background information about Callisto + + * ganymed.cc: + - added background information about Ganymed + + * mjobs/MJCalibrateSignal.cc: + - removed special MC code. The MC files now have a lo-gain + switch and we can extract the pedestal rms from lo-gain + - don't print statistics if nothing was executed Index: trunk/MagicSoft/Mars/Makefile =================================================================== --- trunk/MagicSoft/Mars/Makefile (revision 6603) +++ trunk/MagicSoft/Mars/Makefile (revision 6604) @@ -20,5 +20,5 @@ # #PROGRAMS = readraw merpp mars test mona status -PROGRAMS = readdaq merpp readraw callisto star ganymed showlog showplot mars mona +PROGRAMS = readdaq merpp readraw sinope callisto star ganymed showlog showplot mars mona SOLIB = libmars.so CINT = M Index: trunk/MagicSoft/Mars/callisto.cc =================================================================== --- trunk/MagicSoft/Mars/callisto.cc (revision 6603) +++ trunk/MagicSoft/Mars/callisto.cc (revision 6604) @@ -102,4 +102,15 @@ gLog << " showplot or MStatusDisplay in the interpreter. A description of a" << endl; gLog << " sequence-file can be found in the class reference of MSequence." << endl << endl; + gLog << "Background:" << endl; + gLog << " Callisto is a large, icy, dark-colored, low-density outer moon of" << endl; + gLog << " Jupiter that is scarred with impact craters and ejecta. It has a" << endl; + gLog << " diameter of about 4800km, the second-largest moon of Jupiter; it is" << endl; + gLog << " roughly the size of Mercury. Callisto has the largest-known impact" << endl; + gLog << " crater in the Solar System, Valhalla, which has a bright patch 600km" << endl; + gLog << " across and rings that go out to almost 3000km. Callisto orbits" << endl; + gLog << " Jupiter at a mean distance of 1,883,000km. Its mass is 1.1e23 kg. It" << endl; + gLog << " takes Callisto 16.7 days to orbit Jupiter in a synchronous orbit." << endl; + gLog << " Jupiter's moon Callisto was discovered independantly by Galileo and" << endl; + gLog << " S.Marius in 1610." << endl << endl; gLog << "Example:" << endl; gLog << " callisto -f --outc=mycal/ --outy=mysignal/ --log sequence02345.txt" << endl; Index: trunk/MagicSoft/Mars/ganymed.cc =================================================================== --- trunk/MagicSoft/Mars/ganymed.cc (revision 6603) +++ trunk/MagicSoft/Mars/ganymed.cc (revision 6604) @@ -69,6 +69,14 @@ gLog << endl; gLog << " --version, -V Show startup message with version number" << endl; - gLog << " -?, -h, --help This help" << endl; - gLog << endl; + gLog << " -?, -h, --help This help" << endl << endl; + gLog << "Background:" << endl; + gLog << " Ganymed is the largest moon of Jupiter, a large, icy, outer moon that" << endl; + gLog << " is scarred with impact craters and many parallel faults. It has a" << endl; + gLog << " diameter of about 5268km and orbits Jupiter at a mean distance of" << endl; + gLog << " 1,070,000km. It has a magnetic field and probably has a molten iron" << endl; + gLog << " core. It takes Ganymed 7.15 days to orbit Jupiter. Its mass is" << endl; + gLog << " 1.5e23kg. It was independently discovered by Galileo and S.Marius in"<< endl; + gLog << " 1610. Ganymed is the largest moon in the solar system; it is also" << endl; + gLog << " larger than the planets Mercury and Pluto." << endl << endl; } Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6603) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 6604) @@ -88,5 +88,5 @@ #include "MFTriggerPattern.h" #include "MGeomApply.h" -#include "MMcPedestalCopy.h" +//#include "MMcPedestalCopy.h" #include "MPointingPosCalc.h" #include "MPointingPosInterpolate.h" @@ -456,5 +456,5 @@ contcos.SetInverted(); - MMcPedestalCopy pcopy; + //MMcPedestalCopy pcopy; MTaskEnv taskenv1("ExtractSignal"); MTaskEnv taskenv2("ExtractTime"); @@ -472,20 +472,20 @@ calib.SetSignalType(MCalibrateData::kPhe); //----- WORKAROUND: Currently MC has no lo-gain switch ------ - if (IsUseMC()) // MC file - { - calib.SetCalibrationMode(MCalibrateData::kFfactor); - calib.SetPedestalFlag(MCalibrateData::kRun); - // FIXME: What to do for MC files??? - calib.AddPedestal("MPedestalCam", "MPedPhotFundamental"); - calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor"); - calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm"); - } - else - { + //if (IsUseMC()) // MC file + //{ + // calib.SetCalibrationMode(MCalibrateData::kFfactor); + // calib.SetPedestalFlag(MCalibrateData::kRun); + // // FIXME: What to do for MC files??? + // calib.AddPedestal("MPedestalCam", "MPedPhotFundamental"); + // calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor"); + // calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm"); + //} + //else + //{ calib.AddPedestal("Fundamental"); calib.AddPedestal("FromExtractor"); calib.AddPedestal("FromExtractorRndm"); calib.SetPedestalFlag(MCalibrateData::kEvent); - } + //} //---------------------------------------------------------- @@ -624,12 +624,12 @@ tlist2.AddToList(&merge); //----- WORKAROUND: Currently MC has no lo-gain switch ------ - if (IsUseMC()) - tlist2.AddToList(&pcopy); - else - { + //if (IsUseMC()) + // tlist2.AddToList(&pcopy); + //else + //{ tlist2.AddToList(&pedlo1); tlist2.AddToList(&pedlo2); tlist2.AddToList(&pedlo3); - } + //} //----------------------------------------------------------- if (fIsInterlaced) @@ -718,5 +718,6 @@ // Print statistics - tlist.PrintStatistics(); + if (read->GetNumExecutions()>0) + tlist.PrintStatistics(); // make sure owned object are deleted Index: trunk/MagicSoft/Mars/mjobs/MSequence.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 6603) +++ trunk/MagicSoft/Mars/mjobs/MSequence.cc (revision 6604) @@ -130,4 +130,5 @@ #include "MAstro.h" +#include "MString.h" #include "MDirIter.h" @@ -172,4 +173,11 @@ } +const TString MSequence::GetStandardPath(Bool_t raw) const +{ + TString d = MString::Form("/data/MAGIC/Period%03d/", fPeriod); + d += raw ? "rawdata/" : "rootdata/"; + return d; +} + UInt_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const { @@ -179,6 +187,5 @@ if (d.IsNull()) { - d = Form("/data/MAGIC/Period%03d/", fPeriod); - d += raw ? "rawdata/" : "rootdata/"; + d = GetStandardPath(raw); d += fNight.GetStringFmt("%Y_%m_%d"); } Index: trunk/MagicSoft/Mars/mjobs/MSequence.h =================================================================== --- trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 6603) +++ trunk/MagicSoft/Mars/mjobs/MSequence.h (revision 6604) @@ -93,4 +93,6 @@ const TString &GetSource() const { return fSource; } + const TString GetStandardPath(Bool_t raw) const; + // Setter void SetNight(const char*night); Index: trunk/MagicSoft/Mars/sinope.cc =================================================================== --- trunk/MagicSoft/Mars/sinope.cc (revision 6604) +++ trunk/MagicSoft/Mars/sinope.cc (revision 6604) @@ -0,0 +1,447 @@ +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include "MRawRunHeader.h" +#include "MRawEvtData.h" +#include "MRawEvtPixelIter.h" +#include "MRawFileRead.h" +#include "MArrayD.h" +#include "MTaskInteractive.h" +#include "MLog.h" +#include "MLogManip.h" +#include "MArgs.h" +#include "MSequence.h" +#include "MStatusDisplay.h" +#include "MParList.h" +#include "MTaskList.h" +#include "MEvtLoop.h" +#include "MRawFileRead.h" +#include "MDirIter.h" + +using namespace std; + +MRawEvtData data; +MRawRunHeader header; + +MArrayD artime; +MArrayD height(256); +Int_t entries=0; +Int_t events =0; + +Int_t PreProcess(MParList *plist) +{ + artime.Set(header.GetNumSamplesHiGain() + header.GetNumSamplesLoGain()); + return kTRUE; +} + +Int_t Process() +{ + events++; + + // This is the workaround to put hi- and lo-gains together + const Int_t nhigain = header.GetNumSamplesHiGain(); + const Int_t nlogain = header.GetNumSamplesLoGain(); + + const Int_t n = nhigain+nlogain; + + // Real Process + MRawEvtPixelIter pixel(&data); + + Byte_t slices[n]; + + while (pixel.Next()) + { + // This is the fast workaround to put hi- and lo-gains together + memcpy(slices, pixel.GetHiGainSamples(), nhigain); + memcpy(slices+nhigain, pixel.GetLoGainSamples(), nlogain); + + Byte_t *max = slices; + Byte_t *min = slices; + + for (Byte_t *b=slices+1; b=*max) + max = b; + if (*b<=*min) + min = b; + } + + const Int_t smax = max-slices; + const Int_t diff = *max-*min; + + if (diff<50 || diff>235) // no-signal + continue; + + height[diff]++; + artime[smax]++; + entries++; + } + return kTRUE; +} + +Int_t GetFWHM(const TH1D &h, Int_t &min, Int_t &max) +{ + const Double_t hmax = h.GetMaximum()/2; + const Int_t bin = h.GetMaximumBin(); + + for (min=bin; min>1; min--) + if (h.GetBinContent(min)AddTab("Time"); + h1.DrawClone(); + l.DrawLine(h1.GetMaximumBin()-1, 0, h1.GetMaximumBin()-1, h1.GetMaximum()); + const Int_t fwhm1 = GetFWHM(h1, min, max); + const Bool_t asym1 = TMath::Abs((h1.GetMaximumBin()-min)-(max-h1.GetMaximumBin()))>fwhm1/2;; + l.DrawLine(min-1, h1.GetMaximum()/2, max-1, h1.GetMaximum()/2); + gPad->Update(); + d->AddTab("Pulse"); + h2.DrawClone(); + l.DrawLine(h2.GetMaximumBin()-1, 0, h2.GetMaximumBin()-1, h2.GetMaximum()); + const Int_t fwhm2 = GetFWHM(h2, min, max); + const Bool_t asym2 = TMath::Abs((h2.GetMaximumBin()-min)-(max-h2.GetMaximumBin()))>fwhm2/2;; + l.DrawLine(min-1, h2.GetMaximum()/2, max-1, h2.GetMaximum()/2); + gPad->Update(); + + d->SaveAsRoot(Form("%sroot", kOutpath.Data())); + + ofstream fout(Form("%stxt", kOutpath.Data())); + if (!fout) + { + gLog << err << "Cannot open file: " << strerror(errno) << endl; + return kERROR; + } + + fout << "Events: " << events << endl; + fout << "HasSignals: " << (fwhm1>10?"No":"Yes") << endl; + fout << "HasPedestal: " << (fwhm1<20?"No":"Yes") << endl; + fout << endl; + fout << "PositionSignal: " << h1.GetMaximumBin()-1 << endl; + fout << "PositionFWHM: " << fwhm1 << endl; + fout << "PositionAsym: " << (asym1?"Yes":"No") << endl; + fout << endl; + fout << "HeightSignal: " << h2.GetMaximumBin()-1 << endl; + fout << "HeightFWHM: " << fwhm2 << endl; + fout << "HeightAsym: " << (asym2?"Yes":"No") << endl; + fout << endl; + + + return kTRUE; +} + +static void StartUpMessage() +{ + gLog << all << endl; + + // 1 2 3 4 5 + // 12345678901234567890123456789012345678901234567890 + gLog << "========================================================" << endl; + gLog << " Sinope - MARS V" << MARSVER << endl; + gLog << " MARS -- SImple Non Online Pulse Evaluation" << endl; + gLog << " Compiled on <" << __DATE__ << ">" << endl; + gLog << " Using ROOT v" << ROOTVER << endl; + gLog << "========================================================" << endl; + gLog << endl; +} + +static void Usage() +{ + // 1 2 3 4 5 6 7 8 + // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 + gLog << all << endl; + gLog << "Sorry the usage is:" << endl; + gLog << " sinope [options] --run={number} --date={yyyy-mm-dd}" << endl << endl; + gLog << " Arguments:" << endl; + gLog << " --run={number}: Run number of run to process" << endl; + gLog << " --date={yy-mm-dd}: Night the run belongs to" << endl << endl; + gLog << " Root Options:" << endl; + gLog << " -b Batch mode (no graphical output to screen)" << endl<" << endl; + // gLog << " --debug-env[=1] Display untouched resources after program execution" << endl; + // gLog << " --debug-env=2 Display untouched resources after eventloop setup" << endl; + // gLog << " --debug-env=3 Debug setting resources from resource file" << endl; + gLog << " --debug-mem Debug memory usage" << endl << endl; + gLog << endl; + gLog << " -q Quit when job is finished" << endl; + gLog << " -f Force overwrite of existing files" << endl; + gLog << " --ind=path Path where to search for the data file" << endl; + gLog << " [default=standard path in datacenter]" << endl; + gLog << " --out=path Path to write the all results to [def=local path]" << endl; + gLog << " --num={number} Number of events to process (default=1000)" << endl; + gLog << " --print-seq Print Sequence information" << endl; + gLog << " --print-files Print Files taken from Sequence" << endl; + gLog << " --print-found Print Files found from Sequence" << endl; + // gLog << " --config=callisto.rc Resource file [default=callisto.rc]" << endl; + gLog << endl; + gLog << " --version, -V Show startup message with version number" << endl; + gLog << " -?, -h, --help This help" << endl << endl; + gLog << "Background:" << endl; + gLog << " Sinope is Jupiter's sixteenth moon. Sinope is 28km in diameter and" << endl; + gLog << " and orbits 23,700,000km from Jupiter. Sinope has a mass of 8e16kg." << endl; + gLog << " It orbits Jupiter in 758days and is in a retrograde orbit (orbiting" << endl; + gLog << " opposite to the direction of Jupiter). Very little is known about" << endl; + gLog << " Sinope. Sinope was discovered by S.Nicholson in 1914." << endl << endl; + gLog << "Example:" << endl; + gLog << " sinope -f --date=2004-05-06 --run=32456" << endl; + gLog << endl; +} + +static void PrintFiles(const MSequence &seq, const TString &kInpathD, Bool_t all) +{ + const char *prep = all ? "Found" : "Scheduled"; + + MDirIter Next; + seq.SetupAllRuns(Next, kInpathD, "[PCD]", kTRUE); + + gLog << all; + gLog.Separator(Form("%s Files", prep)); + Next.Print(all?"all":""); + gLog << endl; +} + +int main(int argc, char **argv) +{ + StartUpMessage(); + + // + // Evaluate arguments + // + MArgs arg(argc, argv, kTRUE); + + if (arg.HasOnly("-V") || arg.HasOnly("--version")) + return 0; + + if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help")) + { + Usage(); + return -1; + } + + gLog.Setup(arg); + + //const TString kConfig = arg.GetStringAndRemove("--config=", "callisto.rc"); + + const Bool_t kPrintSeq = arg.HasOnlyAndRemove("--print-seq"); + const Bool_t kPrintFiles = arg.HasOnlyAndRemove("--print-files"); + const Bool_t kPrintFound = arg.HasOnlyAndRemove("--print-found"); + const Bool_t kDebugMem = arg.HasOnlyAndRemove("--debug-mem"); + //Int_t kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0; + //kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv); + + const Bool_t kQuit = arg.HasOnlyAndRemove("-q"); + const Bool_t kBatch = arg.HasOnlyAndRemove("-b"); + const Bool_t kOverwrite = arg.HasOnlyAndRemove("-f"); + //const Bool_t kForceExec = arg.HasOnlyAndRemove("-ff"); + + const TString kInpathD = arg.GetStringAndRemove("--ind=", ""); + /*const TString*/ kOutpath = arg.GetStringAndRemove("--out=", ""); + + const Int_t kNumEvents = arg.GetIntAndRemove("--num=", 1000); + const Int_t kRunNumber = arg.GetIntAndRemove("--run=", -1); + const TString kDate = arg.GetStringAndRemove("--date=", ""); + + if (arg.GetNumOptions()>0) + { + gLog << warn << "WARNING - Unknown commandline options..." << endl; + arg.Print("options"); + gLog << endl; + return -1; + } + + if (kRunNumber<0) + { + gLog << warn << "ERROR - No '--run=' option given... required." << endl; + gLog << endl; + return -1; + } + if (kDate.IsNull()) + { + gLog << warn << "ERROR - No '--date=' option given... required." << endl; + gLog << endl; + return -1; + } + + // + // check for the right usage of the program + // + if (arg.GetNumArguments()>0) + { + Usage(); + return -1; + } + + if (kDebugMem) + TObject::SetObjectStat(kTRUE); + + // + // Setup sequence and check its validity + // + MSequence seq; + seq.SetNight(kDate); + seq.AddRuns(kRunNumber); + if (kPrintSeq) + { + gLog << all; + gLog.Separator(); + seq.Print(); + gLog << endl; + } + if (!seq.IsValid()) + { + gLog << err << "Sequence invalid!" << endl << endl; + return -1; + } + + // + // Process print options + // + if (kPrintFiles) + PrintFiles(seq, kInpathD, kFALSE); + if (kPrintFound) + PrintFiles(seq, kInpathD, kTRUE); + + if (kOutpath.IsNull()) + kOutpath = seq.GetStandardPath(kTRUE); + if (!kOutpath.EndsWith("/")) + kOutpath += "/"; + kOutpath += Form("sinope%08d.", kRunNumber); + + if (!kOverwrite) + { + TString file = Form("%sroot", kOutpath.Data()); + if (!gSystem->AccessPathName(file, kFileExists)) + { + gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl; + return -1; + } + file = Form("%stxt", kOutpath.Data()); + if (!gSystem->AccessPathName(file, kFileExists)) + { + gLog << err << "Sorry, file '" << file << "' exists... use -f option.." << endl; + return -1; + } + } + + // + // Initialize root + // + MArray::Class()->IgnoreTObjectStreamer(); + MParContainer::Class()->IgnoreTObjectStreamer(); + + TApplication app("Sinope", &argc, argv); + if (!gROOT->IsBatch() && !gClient || gROOT->IsBatch() && !kBatch) + { + gLog << err << "Bombing... maybe your DISPLAY variable is not set correctly!" << endl; + return 1; + } + + // ---------------------------------------------------------- + + /*MStatusDisplay **/d = new MStatusDisplay; + + // From now on each 'Exit' means: Terminate the application + d->SetBit(MStatusDisplay::kExitLoopOnExit); + d->SetTitle(Form("Sinope #%d", kRunNumber)); + + MDirIter iter; + seq.SetupAllRuns(iter, 0, "[DPC]", kTRUE); + + MRawFileRead read; + read.AddFiles(iter); + + MTaskInteractive task; + + task.SetPreProcess(PreProcess); + task.SetProcess(Process); + task.SetPostProcess(PostProcess); + + MTaskList tlist; + tlist.AddToList(&read); + tlist.AddToList(&task); + + MParList plist; + plist.AddToList(&tlist); + + plist.AddToList(&data); + plist.AddToList(&header); + + MEvtLoop evtloop; + evtloop.SetParList(&plist); + evtloop.SetDisplay(d); + + if (!evtloop.Eventloop(kNumEvents)) + return 1; + + if (!evtloop.GetDisplay()) + { + gLog << warn << "Display closed by user... execution aborted." << endl << endl; + return 0; + } + + tlist.PrintStatistics(); + + if (kBatch || kQuit) + delete d; + else + { + // From now on each 'Close' means: Terminate the application + d->SetBit(MStatusDisplay::kExitLoopOnClose); + + // Wait until the user decides to exit the application + app.Run(kFALSE); + } + + if (TObject::GetObjectStat()) + { + TObject::SetObjectStat(kFALSE); + gObjectTable->Print(); + } + + return 0; +}