Changeset 6604 for trunk

Timestamp:

02/18/05 16:29:20 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• Makefile (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (5 diffs)
• mjobs/MSequence.cc (modified) (3 diffs)
• mjobs/MSequence.h (modified) (1 diff)
• sinope.cc (added)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
 
 
+
  2005/02/18 Thomas Bretz
 
@@ -40 +41 @@
      - 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
 
 

trunk/MagicSoft/Mars/Makefile

@@ -20 +20 @@
 #
 #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

trunk/MagicSoft/Mars/callisto.cc

@@ -102 +102 @@
     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;

trunk/MagicSoft/Mars/ganymed.cc

@@ -69 +69 @@
     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;
 }
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -88 +88 @@
 #include "MFTriggerPattern.h"
 #include "MGeomApply.h"
-#include "MMcPedestalCopy.h"
+//#include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
 #include "MPointingPosInterpolate.h"
@@ -456 +456 @@
     contcos.SetInverted();
 
-    MMcPedestalCopy pcopy;
+    //MMcPedestalCopy pcopy;
     MTaskEnv taskenv1("ExtractSignal");
     MTaskEnv taskenv2("ExtractTime");
@@ -472 +472 @@
     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 +624 @@
     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 +718 @@
 
     // Print statistics
-    tlist.PrintStatistics();
+    if (read->GetNumExecutions()>0)
+        tlist.PrintStatistics();
 
     // make sure owned object are deleted

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -130 +130 @@
 
 #include "MAstro.h"
+#include "MString.h"
 #include "MDirIter.h"
 
@@ -172 +173 @@
 }
 
+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 +187 @@
     if (d.IsNull())
     {
-        d  = Form("/data/MAGIC/Period%03d/", fPeriod);
-        d += raw ? "rawdata/" : "rootdata/";
+        d = GetStandardPath(raw);
         d += fNight.GetStringFmt("%Y_%m_%d");
     }

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -93 +93 @@
     const TString &GetSource() const { return fSource; } 
 
+    const TString GetStandardPath(Bool_t raw) const;
+
     // Setter
     void SetNight(const char*night);