Changeset 8720

Timestamp:

08/30/07 21:32:53 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mdata/MDataMember.cc (modified) (1 diff)
• mfilter/MFEvtNumber.cc (modified) (1 diff)
• mhflux/MMcSpectrumWeight.cc (modified) (3 diffs)
• mjobs/MJCut.cc (modified) (1 diff)
• mpointing/MPointing.cc (modified) (1 diff)
• mpointing/MSrcPosCorrect.cc (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)
• sponde.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2007/08/30 Thomas Bretz
+
+   * sponde.cc:
+     - changed window name from sequence to ganymed-file
+
+   * mdata/MDataMember.cc, mpointing/MSrcPosCorrect.cc:
+     - fixed a typo in the comment
+
+   * mfilter/MFEvtNumber.cc:
+     - call TTree::SetEstimate as suggested by the class description
+
+   * mhflux/MMcSpectrumWeight.cc:
+     - fixed some comments
+     - further improved  Print-output
+
+   * mjobs/MJCut.cc:
+     - fixed a typo in the output
+
+   * mpointing/MPointing.cc:
+     - added possibility to add comments starting with #
+
+   * mraw/MRawRunHeader.cc:
+     - fixed a small problem in the Print-output
+
+
+
  2007/08/28 Thomas Bretz
 

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -93 +93 @@
 // --------------------------------------------------------------------------
 //
-// returns the value you requested
+// Returns the value you requested
 //
 Double_t MDataMember::GetValue() const

trunk/MagicSoft/Mars/mfilter/MFEvtNumber.cc

@@ -109 +109 @@
     }
 
+    t->SetEstimate(t->GetEntries());
+
     if (t->Draw("RunNumber.fVal:EvtNumber.fVal", fSelector, "goff")<0)
     {

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -33 +33 @@
 //  pass to this class in different ways:
 //
-//    1. Is the new spectrum will be a power law, just introduce the slope
+//    1. If the new spectrum will be a power law, just introduce the slope
 //       of this power law.
-//    2. Is the new spectrum will have a general shape:
+//    2. If the new spectrum will have a general shape:
 //       The new spectrum is passed as a char* (SetFormula())
 //
@@ -493 +493 @@
     if (hasold)
     {
-        *fLog << " Old Spectrum:             " << GetFormulaSpecOldX();
+        *fLog << " Old Spectrum:             ";
+        if (fNewSlope==-99)
+            *fLog << "undefined";
+        else
+            *fLog << GetFormulaSpecOldX();
         if (fEnergyMin>=0 && fEnergyMax>0)
             *fLog << "   (I=" << GetSpecOldIntegral() << ")";
@@ -500 +504 @@
     if (hasnew)
     {
-        *fLog << " New Spectrum:             " << GetFormulaSpecNewX();
+        *fLog << " New Spectrum:             ";
+        if (fNewSlope==-99 && fFormula.IsNull())
+            *fLog << "undefined/no change";
+        else
+            *fLog << GetFormulaSpecNewX();
         if (fEnergyMin>=0 && fEnergyMax>0)
             *fLog << "   (I=" << GetSpecNewIntegral() << ")";

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -560 +560 @@
     if (!set.IsWobbleMode() && fNumOffSourcePos!=1)
     {
-        *fLog << inf << "No wobble mode but NumOffSoucePos!=1 (" << fNumOffSourcePos << ")... reset to 1." << endl;
+        *fLog << inf << "No wobble mode, but NumOffSoucePos!=1 (" << fNumOffSourcePos << ")... reset to 1." << endl;
         fNumOffSourcePos = 1;
     }

trunk/MagicSoft/Mars/mpointing/MPointing.cc

@@ -208 +208 @@
         }
 
+        str = str.Strip(TString::kBoth);
+
         if (str=="END")
             break;
+
+        if (str[0]=='#')
+            continue;
 
         if (str[0]=='&')

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc

@@ -47 +47 @@
 //    We discovered that the procedure we used yester day for Roque Lamp
 //    light source was producing a very non-uniform light
-//    We did some studies to produce an uniformly illuminated li ght from
+//    We did some studies to produce an uniformly illuminated light from
 //    the Roque Lamp Then we moved the telescope to the Roque Lamp position
 //    and did a Laser adjust for the Roque position. We put the telescope to
@@ -56 +56 @@
 //    camer a, we saw a clear offset from the centre. Then we calculated this
 //    offset and put the correct numbers in the AMC code. Then we redid the
-//    laser adjustment and fou nd the spot to be nicely centred.  Our
+//    laser adjustment and found the spot to be nicely centered.  Our
 //    calculations showed that the offset was 0.048 deg in X direction and
 //    0.032 deg in Y direction.

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -573 +573 @@
         *fLog << "Telescope:    " << fTelescopeNumber << endl;
     if (fFormatVersion>7)
+    {
         *fLog << "FadcType:     " << fFadcType << " (";
-    switch (fFadcType)
-    {
-    case 1: *fLog << "Siegen"; break;
-    case 2: *fLog << "MUX"; break;
-    default: *fLog << "unknown";
-    }
-    *fLog << ")" << endl;
+        switch (fFadcType)
+        {
+        case 1: *fLog << "Siegen"; break;
+        case 2: *fLog << "MUX"; break;
+        default: *fLog << "unknown";
+        }
+        *fLog << ")" << endl;
+    }
     *fLog << "RunNumber:    " << fRunNumber << " (Type=" << GetRunTypeStr() << ")" << endl;
     *fLog << "ProjectName: '" << fProjectName << "'" << endl;

trunk/MagicSoft/Mars/sponde.cc

@@ -217 +217 @@
     }
 
-    MJSpectrum job(Form("Spectrum - %s", seq.GetName()));
+    MJSpectrum job(Form("Spectrum - %s", kInfile.Data()));
     job.SetEnv(&env);
     job.SetEnvDebug(kDebugEnv);