Changeset 8434

Timestamp:

04/23/07 20:11:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/NEWS (modified) (1 diff)
• Mars/callisto.cc (modified) (13 diffs)
• Mars/mhcalib/MHCalibrationChargeBlindCam.cc (modified) (1 diff)
• Mars/mhcalib/MHCalibrationHiLoCam.cc (modified) (2 diffs)
• Mars/mhcalib/MHCalibrationPulseTimeCam.cc (modified) (2 diffs)
• Mars/mhcalib/MHPedestalCam.cc (modified) (3 diffs)
• Mars/mhist/MHEvent.cc (modified) (1 diff)
• Mars/mjobs/MJCalib.cc (modified) (3 diffs)
• Mars/mjobs/MJCalibTest.cc (modified) (2 diffs)
• Mars/mjobs/MJCalibrateSignal.cc (modified) (10 diffs)
• Mars/mjobs/MJCalibration.cc (modified) (4 diffs)
• Mars/mjobs/MJStar.cc (modified) (6 diffs)
• Mars/mjobs/MJStar.h (modified) (1 diff)
• Mars/mjobs/MSequence.cc (modified) (6 diffs)
• Mars/mjobs/MSequence.h (modified) (6 diffs)
• Mars/mmovie/MMovieWrite.cc (modified) (6 diffs)
• Mars/mmovie/MMovieWrite.h (modified) (2 diffs)
• Mars/mmovie/Makefile (modified) (1 diff)
• Mars/mraw/MRawRunHeader.cc (modified) (2 diffs)
• Mars/star.cc (modified) (3 diffs)
• include-Classes/MMcFormat/MMcEvt.cxx (modified) (3 diffs)
• include-Classes/MMcFormat/MMcEvt.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/23 Thomas Bretz
+
+   * callisto.cc, star.cc:
+     - removed "-raw" and "-root" option
+     - replaced inflating sequence path by new InflatePath
+       function
+     - removed MJCalib::kUse* usage, use MSequence::IsMonteCarlo
+       instead
+
+   * mhcalib/MHCalibrationChargeBlindCam.cc,
+     mhcalib/MHCalibrationHiLoCam.cc, 
+     mhcalib/MHCalibrationPulseTimeCam.cc:
+     - removed obsolete include of MCalibrationIntensityCam
+
+   * mhcalib/MHPedestalCam.cc:
+     - removed obsolete usage of fIntensCam
+
+   * mhist/MHEvent.cc:
+     - replacedcompilation of description string by new 
+       MMcEvt::GetDescription memeber function
+
+   * mjobs/MJCalib.[h,cc]:
+     - removed fDataFlag and corresponding member functions and 
+       handling
+
+   * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc,
+     mjobs/MJCalibration.cc, mjobs/MJPedestal.cc, mjobs/MJStar.[h,cc]:
+     - replaced IsUseRawData and IsUseRootData by 
+       MSequence::IsMonteCarlo
+     - use fSequence to determin whether it is MC sequence or not
+
+   * mjobs/MJCalibrateSignal.cc:
+     - renamed movie encoding task list
+     - do not write output files if encoding movie
+
+   * mjobs/MSequence.[h,cc]:
+     - removed "merpp"-path
+     - monte carlo files now always have 8digits run numbers
+     - added new resource "MonteCarlo"
+     - added new static member function InflatePath
+     - increased version number to 2
+
+   * mmc/MMcEvt.[hxx,cxx]:
+     - added new member function GetDescription
+
+   * mmovie/MMovieWrite.[h,cc]:
+     - added a sanity check for strange rms values
+     - search for MMcEvt in the parlist and improve output
+       in case of monte carlo data
+     - fixed some typos in the comments of ReadEnv
+
+   * mmovie/Makefile:
+     - added mmc search path 
+
+   * mraw/MRawRunHeader.cc:
+     - set new defaults of fTelescopeNumber, fCameraVersion,
+       fFreqSampling and fNumSignificantBits for old MC data
+
+
+
  2007/04/23 Daniela Dorner
 

trunk/MagicSoft/Mars/NEWS

@@ -17 +17 @@
    - merpp: When reading raw data the data is now stored in a single
      array. The lo-gain array is obsolete. The interface stays the same.
+
+   - callisto: The -root and -raw options to read merpped data have been
+     removed
+
+   - callisto: If the -mc option is given the sequence-name can now be
+     replaced by the MC sequence number
+
+   - callisto: If the sequence file contains "MonteCarlo: Yes" the
+     -mc option can now be omitted
 
    - callisto: Started further simplification by removing obsolete

trunk/MagicSoft/Mars/callisto.cc

@@ -55 +55 @@
     gLog << "   -y                        Extract and calibrate signal" << endl << endl;
     gLog << " Data Type (exclusive):" << endl;
-    gLog << "   -raw                      Read input from raw-data <default>" << endl;
     gLog << "   -mc                       Input root-files are monte carlo files" << endl;
-    gLog << "   -root                     Read input from root-files (merpped)" << endl << endl;
     gLog << " Options:" << endl;
     gLog.Usage();
@@ -192 +190 @@
           Bool_t  kModeC      = arg.HasOnlyAndRemove("-c");
           Bool_t  kModeY      = arg.HasOnlyAndRemove("-y");
-
-    MJCalib::DataType_t kDataType = MJCalib::kIsUseRawData; // root
-    if (arg.HasOnlyAndRemove("-root"))
-        kDataType = MJCalib::kIsUseRootData; // root
-    if (arg.HasOnlyAndRemove("-raw"))
-        kDataType = MJCalib::kIsUseRawData;  // raw
-    if (arg.HasOnlyAndRemove("-mc"))
-        kDataType = MJCalib::kIsUseMC;       // monte carlo
+    const Bool_t  kIsMC       = arg.HasOnlyAndRemove("-mc");
 
     if (!kInpathY.IsNull() || !kOutpathY.IsNull() || !kOutpath.IsNull() || !kPath.IsNull())
@@ -267 +258 @@
     TString kSequence = arg.GetArgumentStr(0);
 
-    if (kSequence.IsDigit())
-    {
-        const Int_t numseq = kSequence.Atoi();
-        kSequence = Form("/magic/sequences/%04d/sequence%08d.txt", numseq/10000, numseq);
-        gLog << inf << "Inflated sequence file: " << kSequence << endl;
-    }
-
-    if (gSystem->AccessPathName(kSequence, kFileExists))
-    {
-        gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
+    if (!MSequence::InflatePath(kSequence, kIsMC))
         return 3;
-    }
 
     if (gSystem->AccessPathName(kConfig, kFileExists))
@@ -293 +274 @@
     //
     MSequence seq(kSequence, kInpathD);
+    if (!seq.IsMonteCarlo())
+        seq.SetMonteCarlo(kIsMC);
     if (kPrintSeq)
     {
@@ -310 +293 @@
     //
     if (kPrintFiles)
-        PrintFiles(seq, kInpathD, kDataType==MJCalib::kIsUseRawData, kFALSE);
+        PrintFiles(seq, kInpathD, !seq.IsMonteCarlo(), kFALSE);
     if (kPrintFound)
-        PrintFiles(seq, kInpathD, kDataType==MJCalib::kIsUseRawData, kTRUE);
+        PrintFiles(seq, kInpathD, !seq.IsMonteCarlo(), kTRUE);
 
     if (seq.HasMoon())
@@ -381 +364 @@
         job1.SetDisplay(d);
         job1.SetOverwrite(kOverwrite);
-        job1.SetDataType(kDataType);
         job1.SetUseHists(kMoon);
 
@@ -411 +393 @@
         job2.SetDisplay(d);;
         job2.SetOverwrite(kOverwrite);
-        job2.SetDataType(kDataType);
         job2.SetUseHists(kMoon);
         job2.SetDeadPixelCheck();
@@ -447 +428 @@
         job3.SetOverwrite(kOverwrite);
         job3.SetPathOut(kOutpathC);
-        job3.SetDataType(kDataType);
         // job2.SetPathIn(kInpathC); // not yet needed
 
@@ -479 +459 @@
             job4.SetOverwrite(kOverwrite);
             job4.SetPathOut(kOutpathC);
-            job4.SetDataType(kDataType);
 
             if (!job4.Process(job1.GetPedestalCam()))
@@ -514 +493 @@
         job1.SetOverwrite(kOverwrite);
         job1.SetPathIn(kInpathY);   // --> READ Extractor from calib-file
-        job1.SetDataType(kDataType);
         //job1.SetPathOut(kOutpathY);   // not yet needed
         job1.SetUseData();
@@ -544 +522 @@
         job2.SetOverwrite(kOverwrite);
         job2.SetPathIn(kInpathY);
-        job2.SetDataType(kDataType);
-        job2.SetPulsePosCheck(kDataType!=MJCalib::kIsUseMC);
+        job2.SetPulsePosCheck(!seq.IsMonteCarlo());
         job2.SetPathOut(kOutpathY); // for updating the extractor
 
@@ -600 +577 @@
         job3.SetOverwrite(kOverwrite);
         job3.SetPathIn(kInpathY);
-        job3.SetDataType(kDataType);
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed
@@ -634 +610 @@
         job4.SetPathIn(kInpathY);
         job4.SetPathOut(kOutpathY);
-        job4.SetDataType(kDataType);
         job4.SetMovieMode(kMovie);
-        if (kDataType!=MJCalib::kIsUseMC)
+        if (!seq.IsMonteCarlo())
             job4.SetExtractor(job2.GetExtractor());
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc

@@ -46 +46 @@
 
 #include "MCalibrationBlindPix.h"
-#include "MCalibrationIntensityCam.h"
 
 #include "MParList.h"

trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.22 2007-04-20 13:55:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.23 2007-04-23 19:06:28 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -105 +105 @@
 #include "MCalibrationHiLoPix.h"
 #include "MCalibrationCam.h"
-#include "MCalibrationIntensityCam.h"
 #include "MCalibrationPix.h"
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.36 2007-04-20 13:55:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.37 2007-04-23 19:06:28 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -123 +123 @@
 #include "MCalibrationPix.h"
 #include "MHCalibrationPix.h"
-#include "MCalibrationIntensityCam.h"
 
 #include "MGeomCam.h"

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc

@@ -101 +101 @@
 #include "MPedestalPix.h"
 
-#include "MCalibrationIntensityCam.h"
 #include "MCalibrationPix.h"
 
@@ -394 +393 @@
                        fFirst, fLast);
         
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+        InitHists(pix, fCam->GetAverageBadArea(j), j);
 
       }
@@ -411 +410 @@
                          fFirst, fLast);
 
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix, fCam->GetAverageBadSector(j), j);
 
       }

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -282 +282 @@
 
     if (fMcEvt)
-    {
-        TString txt("#splitline{");
-
-        txt += fMcEvt->GetParticleName();
-        txt += " ";
-
-        s.Insert(0, txt);
-
-        s += "}{  E=";
-
-        s+= fMcEvt->GetEnergyStr();
-
-        s += " r=";
-        s += (int)(fMcEvt->GetImpact()/100+.5);
-        s += "m Zd=";
-        s += 0.1*TMath::Nint(fMcEvt->GetTelescopeTheta()*180/TMath::Pi()*10);
-        s += "\\circ ";
-        if (fMcEvt->GetPhotElfromShower()>=10000)
-            s += Form("%dk", (Int_t)(fMcEvt->GetPhotElfromShower()/1000.+.5));
-        else
-            if (fMcEvt->GetPhotElfromShower()>=1000)
-                s += Form("%.1fk", fMcEvt->GetPhotElfromShower()/1000.);
-            else
-                s += fMcEvt->GetPhotElfromShower();
-        s += "PhEl}";
-    }
+        s = fMcEvt->GetDescription(s);
 
     gPad=NULL;

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -48 +48 @@
 // - fPulsePosCheck to kFALSE
 //
-MJCalib::MJCalib() : fDataFlag(kIsUseRawData), fStorage(0),
-                     fIsPixelCheck(kFALSE), fIsPulsePosCheck(kFALSE)/*,
-                     fIsHiLoCalibration(kFALSE)*/
+MJCalib::MJCalib() : fStorage(0), fIsPixelCheck(kFALSE), fIsPulsePosCheck(kFALSE)
 {
   SetUseBlindPixel(kFALSE);
   SetUsePINDiode(kFALSE);
-  
+
   SetCheckedPixId();
 }
@@ -63 +61 @@
     SetPulsePosCheck(GetEnv("PulsePosCheck", fIsPulsePosCheck));
     SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
-    //SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
 
     if (HasEnv("StorageType"))
@@ -81 +78 @@
         return kTRUE;
 
-    TString dat = GetEnv("DataType", "");
-    dat = dat.Strip(TString::kBoth);
-    dat.ToLower();
-
-    if (dat == (TString)"raw")
-        SetUseRawData();
-
-    if (dat == (TString)"mc" || dat == (TString)"montecarlo")
-        SetUseMC();
-
-    if (dat == (TString)"root")
-        SetUseRootData();
-
     return kTRUE;
 }

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -287 +287 @@
   if (fSequence.IsValid())
     {
-        if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0)
+        if (fSequence.SetupCalRuns(iter, 0, !fSequence.IsMonteCarlo())<=0)
             return kFALSE;
     }
@@ -369 +369 @@
   read.DisableAutoScheme();
 
-  if (IsUseRawData())
+  if (!fSequence.IsMonteCarlo())
     rawread.AddFiles(iter);
   else

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -80 +80 @@
 #include "MCalibCalcFromPast.h"
 
-#include "MReadReports.h"
 #include "MReadMarsFile.h"
 #include "MRawFileRead.h"
@@ -90 +89 @@
 #include "MGeomApply.h"
 #include "MPedestalSubtract.h"
-//#include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
 #include "MPedCalcFromLoGain.h"
@@ -102 +100 @@
 #include "MCalibrateData.h"
 #include "MCalibrateRelTimes.h"
-//#include "MBadPixelsMerge.h"
 #include "MBadPixelsCalc.h"
 #include "MBadPixelsTreat.h"
@@ -248 +245 @@
     if (fSequence.IsValid())
     {
-        if (fSequence.SetupDatRuns(iter, 0, IsUseRawData())<=0)
+        if (fSequence.SetupDatRuns(iter, 0, !fSequence.IsMonteCarlo())<=0)
             return kFALSE;
     }
@@ -362 +359 @@
     plist.AddToList(&tlist);
 
-    MReadReports readreal;
-    readreal.AddTree("Events", "MTime.", MReadReports::kMaster);
-    readreal.AddTree("Trigger");
-    readreal.AddTree("Camera");
-    readreal.AddTree("Drive");
-    readreal.AddTree("CC");
-    readreal.AddTree("Currents");
-
     MReadMarsFile readmc("Events");
     readmc.DisableAutoScheme();
@@ -375 +364 @@
     MRawFileRead rawread(NULL);
 
-    MRead *read = 0;
-    switch (GetDataFlag())
-    {
-    case kIsUseRawData:  read = &rawread;  break;
-    case kIsUseMC:       read = &readmc;   break;
-    case kIsUseRootData: read = &readreal; break;
-    }
+    MRead *read = fSequence.IsMonteCarlo() ? (MRead*)&readmc : (MRead*)&rawread;
     read->AddFiles(iter);
 
     const TString fname(Form("%s{s/_D_/_Y_}{s/\\.raw$/.root}{s/\\.raw\\.gz$/.root}", fPathOut.Data()));
 
-    
     // Skips MC which have no contents. This are precisely the
     // events which fullfilled the MC Lvl1 trigger and an
@@ -808 +790 @@
     movwrite.SetFilter(&movfilt);
 
-    MTaskList tlistmov;
+    MTaskList tlistmov("MovieEncoder");
     tlistmov.AddToList(&movprep);
     tlistmov.AddToList(&movfilt);
@@ -835 +817 @@
     tlist.AddToList(read);
 
-    if (IsUseMC())
-    {
-        tlist.AddToList(&writemc);
+    if (fSequence.IsMonteCarlo())
+    {
+        if (!fIsMovieMode)
+            tlist.AddToList(&writemc);
         tlist.AddToList(&contmc);
     }
@@ -843 +826 @@
     //if (IsUseRootData())
     //  tlist2.AddToList(&pextr);
-    tlist.AddToList(&tlist2, IsUseRootData() ? "Events" : "All");
-
-    //if (IsUseMC())
+    tlist.AddToList(&tlist2, fSequence.IsMonteCarlo() ? "Events" : "Alls");
+
+    //if (fSequence.IsMonteCarlo())
     //  tlist.AddToList(&pcalc, "Drive");
 
-    tlist.AddToList(&write);
+    if (!fIsMovieMode)
+        tlist.AddToList(&write);
 
     // Create and setup the eventloop
@@ -901 +885 @@
 
     if (!WriteResult(interlacedcont))
-      return kFALSE;
+        return kFALSE;
 
     // return if job went ok

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1458 +1458 @@
 
     // Defined resource id
-    const TString id = IsUseMC() ? "MC" : Form("%02d", period);
+    const TString id = fSequence.IsMonteCarlo() ? "MC" : Form("%02d", period);
 
     // Check for a valid entry for the correct period
@@ -1707 +1707 @@
 
     MDirIter iter;
-    if (fSequence.SetupCalRuns(iter, 0, IsUseRawData())<=0)
+    if (fSequence.SetupCalRuns(iter, 0, !fSequence.IsMonteCarlo())<=0)
         return kFALSE;
 
@@ -1746 +1746 @@
     MRawFileRead rawread(NULL);
 
-    if (IsUseRawData())
+    if (!fSequence.IsMonteCarlo())
     {
         rawread.AddFiles(iter);
@@ -1948 +1948 @@
         SetUsePINDiode(kFALSE);
 
-    const Int_t numexec = IsUseRawData() ? rawread.GetNumExecutions() : read.GetNumExecutions();
+    const Int_t numexec = !fSequence.IsMonteCarlo() ? rawread.GetNumExecutions() : read.GetNumExecutions();
     if (numexec>0)
     {

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -119 +119 @@
 }
 
-Bool_t MJStar::Process(Bool_t ismc)
+Bool_t MJStar::Process()
 {
     if (!fSequence.IsValid())
@@ -275 +275 @@
     write.AddContainer("MMuonSetup",                "RunHeaders");
 
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
     {
         // Monte Carlo Data
@@ -311 +311 @@
     writem.AddContainer("MRawEvtHeader",            "Muons");
     writem.AddContainer("MPointingPos",             "Muons");
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
     {
         // Monte Carlo Data
@@ -318 +318 @@
     }
 
-    if (ismc)
+    if (fSequence.IsMonteCarlo())
         if (fMuonAnalysis)
             writem.AddCopySource("OriginalMC");
@@ -326 +326 @@
     MTaskList tlist2("Events");
     tlist2.AddToList(&apply);
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
         tlist2.AddToList(&cont);
     tlist2.AddToList(&contsw);
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
     {
         // Calibration events don't enter star at all.
@@ -450 +450 @@
     // ------------------------------------------------------------
 
-    tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
-    tlist.AddToList(&pcalc,  ismc ? "Events" : "Drive");
+    tlist.AddToList(fSequence.IsMonteCarlo() ? (MTask*)&readmc : (MTask*)&readreal);
+    tlist.AddToList(&pcalc,  fSequence.IsMonteCarlo() ? "Events" : "Drive");
     //tlist.AddToList(&filltst, "Events");
     tlist.AddToList(&tlist2, "Events");
-    if (!ismc)
+    if (!fSequence.IsMonteCarlo())
     {
         // initiate task list

trunk/MagicSoft/Mars/mjobs/MJStar.h

@@ -21 +21 @@
 
     // Process
-    Bool_t Process(Bool_t ismc=kFALSE);
+    Bool_t Process();
 
     ClassDef(MJStar, 0) // Tool to create a pedestal file (MPedestalCam)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -118 +118 @@
 //    seq.SetupPedRuns(iter, "/mypath", "[DPC]");
 //
+// ===========================================================================
+//
+//  Class Version 2:
+//   + fMonteCarlo
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MSequence.h"
@@ -220 +225 @@
         switch (type)
         {
-        case kRawDat:
+        case kRawDat:  // rawdata
         case kRawPed:
         case kRawCal:
         case kRawAll:
-            d += "rawfiles/";
-            d += fNight.GetStringFmt("%Y/%m/%d");
-            break;
-        case kRootDat:
+        case kRootDat: // mcdata
         case kRootPed:
         case kRootCal:
         case kRootAll:
-            d += "merpp/";
+            d += "rawfiles/";
             d += fNight.GetStringFmt("%Y/%m/%d");
             break;
@@ -253 +255 @@
         // Changes to read the DAQ numbering format. Changes takes place
         // between runs 35487 and 00035488 (2004_08_30)
-        const char *fmt = arr[i]>35487 ? "%08d_%s_*_E" : "%05d_%s_*_E";
+        const char *fmt = arr[i]>35487 || fMonteCarlo ? "%08d_%s_*_E" : "%05d_%s_*_E";
 
         TString n;
@@ -447 +449 @@
     fTriggerTable = env.GetValue("TriggerTable", "");
     fHvSettings   = env.GetValue("HvSettings", "");
+    fMonteCarlo   = env.GetValue("MonteCarlo", kFALSE);
 
     str = env.GetValue("Runs", "");
@@ -488 +491 @@
     }
     gLog << "Sequence:       " << fSequence << endl;
+    if (fMonteCarlo)
+        gLog << "MonteCarlo:     Yes" << endl;
     gLog << "Period:         " << fPeriod << endl;
     gLog << "Night:          " << fNight << endl << endl;
@@ -646 +651 @@
     fPeriod = MAstro::GetMagicPeriod(fNight.GetMjd());
 }
+
+// --------------------------------------------------------------------------
+//
+// If the sequence name seq is just a digit it is inflated to a full
+// path following the datacenter standard.
+//
+// Returns if file accessible or not.
+//
+Bool_t MSequence::InflatePath(TString &seq, Bool_t ismc)
+{
+    if (seq.IsDigit())
+    {
+        const Int_t numseq = seq.Atoi();
+        seq = "/magic/";
+        if (ismc)
+            seq += "montecarlo/";
+        seq += Form("sequences/%04d/sequence%08d.txt", numseq/10000, numseq);
+        gLog << inf << "Inflated sequence file: " << seq << endl;
+    }
+
+    if (!gSystem->AccessPathName(seq, kFileExists))
+        return kTRUE;
+
+    gLog << err << "Sorry, sequence file '" << seq << "' doesn't exist." << endl;
+    return kFALSE;
+}

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -51 +51 @@
     TArrayI fDatRuns;
 
+    Bool_t fMonteCarlo;
+
     //TExMap fFileNames;
 
@@ -65 +67 @@
 public:
     MSequence() : fSequence((UInt_t)-1), fLastRun((UInt_t)-1),
-        fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1) { }
+        fNumEvents((UInt_t)-1), fPeriod((UInt_t)-1), fMonteCarlo(kFALSE) { }
     MSequence(const char *fname, const char *path="");
     MSequence(const MSequence &s) : fSequence(s.fSequence), fStart(s.fStart),
@@ -72 +74 @@
         fTriggerTable(s.fTriggerTable), fHvSettings(s.fHvSettings),
         fRuns(s.fRuns), fCalRuns(s.fCalRuns), fPedRuns(s.fPedRuns),
-        fDatRuns(s.fDatRuns) { }
+        fDatRuns(s.fDatRuns), fMonteCarlo(s.fMonteCarlo) { }
     ~MSequence();
 
@@ -80 +82 @@
     // Genaral interface
     Bool_t IsValid() const { return fSequence!=(UInt_t)-1; }
+    Bool_t IsMonteCarlo() const { return fMonteCarlo; }
+
+    void SetMonteCarlo(Bool_t ismc=kTRUE) { fMonteCarlo=ismc; }
 
     UInt_t SetupPedRuns(MDirIter &iter, const char *path=0, Bool_t raw=kFALSE) const;
@@ -115 +120 @@
     const TString &GetSource() const { return fSource; } 
 
-    const TString GetStandardPath() const { return "/magic/data/"; }
+    const TString GetStandardPath() const { return fMonteCarlo?"/magic/montecarlo/":"/magic/data/"; }
 
     const TString &GetFileName() const { return fFileName; }
@@ -133 +138 @@
     UInt_t AddDatRuns(UInt_t num) { return AddDatRuns(num, num); }
 
-    ClassDef(MSequence, 1)
+    static Bool_t InflatePath(TString &seq, Bool_t ismc=kFALSE);
+
+    ClassDef(MSequence, 2)
 };
 

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -78 +78 @@
 //   MBadPixelsCam
 //   MMovieData
+//   [MMcEvt]
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -97 +98 @@
 #include "MGeomCam.h"
 #include "MGeomPix.h"
+
+#include "MMcEvt.hxx"
 
 #include "MH.h"
@@ -279 +282 @@
         return kFALSE;
     }
+
+    fMC = (MMcEvt*)plist->FindObject("MMcEvt");
 
     return OpenPipe();
@@ -592 +597 @@
 
     const Double_t rms = fIn->GetMedianPedestalRms();
-
-    h.SetMinimum(fIn->GetMax()-(fIn->GetMax()-rms)*99/98); // rms0
-    h.SetMaximum(fIn->GetMax());
+    const Double_t max = fIn->GetMax();    // scale the lover limit such
+    const Double_t dif = (max-rms)*99/98;  // that everything below rms is
+    const Double_t min = max-dif;          // displayed as white
+
+    // If the maximum is equal or less the
+    // pedestal rms something must be wrong
+    if (dif<=0)
+        return kFALSE;
+
+    h.SetMinimum(min);
+    h.SetMaximum(max);
 
     // -----------------------------------------
@@ -763 +776 @@
 
     cout << "MED=" << rms0 << endl;
-  */
+    */
+
+    TString s = Form("%d: ", GetNumExecutions()+1);
+    s += "Evt #";
+    s += fHead->GetDAQEvtNumber();
+    s += " of ";
+    s += "Run #";
+    s += fRun->GetRunNumber();
+    if (fMC)
+        s = fMC->GetDescription(s);
+
     MHCamera h(*fCam);
-    h.SetTitle(Form("%d: Run #%d,  Evt %d", GetNumExecutions()+1,
-                    fRun->GetRunNumber(), fHead->GetDAQEvtNumber()));
+    h.SetTitle(s);
     h.SetAllUsed();
     h.SetYTitle("V [au]");
@@ -815 +837 @@
 //
 // Example:
-//   MMoviePrepare.TargetLength: 5 <seconds>
-//   MMoviePrepare.NumEvents: 500
-//   MMoviePrepare.Threshold: 2 <rms>
-//   MMoviePrepare.Filename: movie.mpg
+//   MMovieWrite.TargetLength: 5 <seconds>
+//   MMovieWrite.NumEvents: 500
+//   MMovieWrite.Threshold: 2 <rms>
+//   MMovieWrite.Filename: movie.mpg
 //
 Int_t MMovieWrite::ReadEnv(const TEnv &env, TString prefix, Bool_t print)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.h

@@ -9 +9 @@
 class TASImage;
 
+class MMcEvt;
 class MGeomCam;
 class MMovieData;
@@ -26 +27 @@
     MBadPixelsCam *fBad;   //! Information about bad pixels
     MPedestalCam  *fPed;   //! Fundamental pedestal for palette and cleaning
+    MMcEvt        *fMC;    //! Informatio about MC events
 
     MMovieData    *fIn;    //! Input data with splines for all pixels

trunk/MagicSoft/Mars/mmovie/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mraw -I../mgeom -I../mhbase -I../mgui \
            -I../mcalib -I../msignal -I../mbadpixels -I../mpedestal   \
-           -I../mhist
+           -I../mhist -I../mmc
 
 SRCFILES = MMoviePrepare.cc \

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -138 +138 @@
     fPixAssignment = new MArrayS(0);
 
+    // Remark: If we read old MC data from a root file which do not
+    // yet contain one of these variable, the value given here is
+    // the default. Do not mix files with and without a value if the
+    // files with the value do not match the default!
     fFormatVersion=0;
     fSoftVersion=0;
-    fTelescopeNumber=0;
-    fCameraVersion=0;
-    fFadcType = 0;
+    fTelescopeNumber=1;
+    fCameraVersion=1;
+    fFadcType=0;
     fRunType=kRTNone;  // use 0xffff for invalidation, 0 means: Data run
     fRunNumber=0;
@@ -155 +159 @@
     fNumSamplesHiGain=0;
     fNumEvents=0;
+    fNumBytesPerSample=1;
+    fFreqSampling=300;
+    fNumSignificantBits=8;
 }
 

trunk/MagicSoft/Mars/star.cc

@@ -157 +157 @@
     // Something special for datacenter access
     //
-    if (kSequence.IsDigit())
-    {
-        const Int_t numseq = kSequence.Atoi();
-        kSequence = Form("/magic/sequences/%04d/sequence%08d.txt", numseq/10000, numseq);
-        gLog << inf << "Inflated sequence file: " << kSequence <<  endl;
-    }
-
-    if (gSystem->AccessPathName(kSequence, kFileExists))
-    {
-        gLog << err << "Sorry, sequence file '" << kSequence << "' doesn't exist." << endl;
-        return 2;
-    }
+    if (!MSequence::InflatePath(kSequence, kIsMC))
+        return 2;
 
     if (gSystem->AccessPathName(kConfig, kFileExists))
@@ -180 +170 @@
     //
     MSequence seq(kSequence, kInpath);
+    if (!seq.IsMonteCarlo())
+        seq.SetMonteCarlo(kIsMC);
     if (kPrintSeq)
     {
@@ -248 +240 @@
             job.DisableMuonAnalysis();
 
-        if (!job.Process(kIsMC))
+        if (!job.Process())
         {
             gLog << err << "Calculation of image parameters failed." << endl << endl;

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

@@ -18 +18 @@
 !   Author(s):
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -199 +199 @@
 
     fFadcTimeJitter = fadc_jitter;
-    
+
     fEventReuse = reuse;
 }
@@ -217 +217 @@
     TString str(opt);
     if (str.IsNull())
-    {
         *fLog << " Photoelectrons: " << fPhotElfromShower << endl;
-        return;
-    }
-}
+}
+
+// --------------------------------------------------------------------------
+//
+// Return a proper description of the monte carlo event
+//
+TString MMcEvt::GetDescription(TString s) const
+{
+    TString txt("#splitline{");
+
+    txt += GetParticleName();
+    txt += " ";
+    txt += s;
+    txt += "}{  E=";
+    txt += GetEnergyStr();
+    txt += " r=";
+    txt += (int)(GetImpact()/100+.5);
+    txt += "m Zd=";
+    txt += 0.1*TMath::Nint(GetTelescopeTheta()*180/TMath::Pi()*10);
+    txt += "\\circ ";
+    if (GetPhotElfromShower()>=10000)
+        txt += Form("%dk", (Int_t)(GetPhotElfromShower()/1000.+.5));
+    else
+        if (GetPhotElfromShower()>=1000)
+            txt += Form("%.1fk", GetPhotElfromShower()/1000.);
+        else
+            txt += GetPhotElfromShower();
+    txt += "PhEl}";
+
+    return txt;
+}

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -100 +100 @@
     Float_t GetMuonCphFraction() const { return fMuonCphFraction; }
 
+    TString GetDescription(TString s="") const;
+
     // Setter
     void SetTheta(Float_t Theta) { fTheta=Theta; }                //Set Theta angle