Changeset 9352 for trunk/MagicSoft

Timestamp:

02/19/09 20:09:42 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcorsika/MCorsikaRunHeader.cc (modified) (3 diffs)
• mimage/MImgCleanStd.cc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (1 diff)
• msim/MSimMMCS.cc (modified) (1 diff)
• readcorsika.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -67 +67 @@
      - clean isolated pixels away before calculating image parameters
      - don't clean calibration runs
+     - correct displayed az ba magnetic field
+
+   * readcorsika.cc:
+     - implemented -ff option
+
+   * mcorsika/MCorsikaRunHeader.cc:
+     - improved Print output
+
+   * mimage/MImgCleanStd.cc:
+     - fixed the checks for the cleaning parameters there 
+       where some wrong conditions
+
+   * msim/MSimMMCS.cc:
+     - fixed typo in a comment
 
 

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -261 +261 @@
 
     *fLog << "MagneticField:  X/Z=(" << fMagneticFieldX << "/";
-    *fLog << fMagneticFieldZ << ")  Az=" << fMagneticFieldAz*TMath::RadToDeg() << "deg" << endl;
+    *fLog << fMagneticFieldZ << ")" << UTF8::kMu << "T  Az=" << fMagneticFieldAz*TMath::RadToDeg() << "deg  (magnetic North w.r.t. North)" << endl;
 
     *fLog << "Spectrum:       Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  endl;
@@ -267 +267 @@
 
     if (fViewConeOuterAngle>0)
-        *fLog << "ViewCone:       " << fViewConeInnerAngle << "deg-" << fViewConeOuterAngle << "deg" << endl;
+        *fLog << "ViewCone:       " << fViewConeInnerAngle << UTF8::kDeg << "-" << fViewConeOuterAngle << UTF8::kDeg << endl;
 
     if (fZdMax>=0)
     {
-        *fLog << "Zd/Az:          " << fZdMin << "deg";
+        *fLog << "Zd/Az:          " << fZdMin << UTF8::kDeg;
         if (fZdMin==fZdMax)
             *fLog << " (fixed)";
         else
-            *fLog << "-" << fZdMax << "deg";
-        *fLog << " / " << fAzMin << "deg";
+            *fLog << "-" << fZdMax << UTF8::kDeg;
+        *fLog << " / " << fAzMin << UTF8::kDeg;
         if (fAzMin==fAzMax)
             *fLog << " (fixed)";
         else
-            *fLog << "-" << fAzMax << "deg";
-        *fLog << endl;
-    }
-
-    *fLog << "Atm.Coeff A:   ";
-    for (int i=0; i<5; i++)
-        *fLog << " " << fAtmosphericCoeffA[i];
-    *fLog << endl;
-    *fLog << "Atm.Coeff B:   ";
-    for (int i=0; i<5; i++)
-        *fLog << " " << fAtmosphericCoeffB[i];
-    *fLog << endl;
-    *fLog << "Atm.Coeff C:   ";
-    for (int i=0; i<5; i++)
-        *fLog << " " << fAtmosphericCoeffC[i];
-    *fLog << endl;
+            *fLog << "-" << fAzMax << UTF8::kDeg;
+        *fLog << "  w.r.t. magnetic North." << endl;
+    }
 
     *fLog << "Options used:  ";
@@ -315 +302 @@
         *fLog << " SLANT";
     *fLog << endl;
-}
-
+
+    *fLog << "Atm.Coeff A:   ";
+    for (int i=0; i<5; i++)
+        *fLog << " " << fAtmosphericCoeffA[i];
+    *fLog << endl;
+    *fLog << "Atm.Coeff B:   ";
+    for (int i=0; i<5; i++)
+        *fLog << " " << fAtmosphericCoeffB[i];
+    *fLog << endl;
+    *fLog << "Atm.Coeff C:   ";
+    for (int i=0; i<5; i++)
+        *fLog << " " << fAtmosphericCoeffC[i];
+    *fLog << endl;
+
+}
+

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -775 +775 @@
     }
 
-    if (fKeepIsolatedPixels && fTimeLvl2<fCleanLvl1)
+    if (fKeepIsolatedPixels && fCleanLvl0<fCleanLvl1)
     {
         *fLog << warn << "WARNING - fKeepIsolatedPixels set but CleanLvl0 (" << fTimeLvl2 << ") < fCleanLvl1 (" << fCleanLvl1 << ")... resetting fTimeLvl2." << endl;
         fTimeLvl2 = fCleanLvl1;
     }
-    if (!fKeepIsolatedPixels && fTimeLvl2>fCleanLvl1)
+    if (!fKeepIsolatedPixels && fCleanLvl0>fCleanLvl1)
     {
         *fLog << warn << "WARNING - fKeepIsolatedPixels not set but CleanLvl0 (" << fTimeLvl2 << ") > fCleanLvl1 (" << fCleanLvl1 << ")... setting fKeepIsolatedCorePixels." << endl;

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -194 +194 @@
     hist.InitTitle("FirstInteractionHeight;h [km]");
 
-    hist.AddHist("MCorsikaEvtHeader.fAz*TMath::RadToDeg()", "MCorsikaEvtHeader.fZd*TMath::RadToDeg()");
+    hist.AddHist("(MCorsikaEvtHeader.fAz+MCorsikaRunHeader.fMagneticFieldAz)*TMath::RadToDeg()", "MCorsikaEvtHeader.fZd*TMath::RadToDeg()");
     hist.InitName("SkyOrigin;Az;Zd");
     hist.InitTitle("Sky Origin;Az [deg];Zd [deg]");

trunk/MagicSoft/Mars/msim/MSimMMCS.cc

@@ -177 +177 @@
     static_cast<MMcEvtBasic&>(*fMcEvt) = *fMcEvtBasic;
 
-    // Convert from corsika franme to telescope frame, taking
+    // Convert from corsika frame to telescope frame, taking
     // the magnetic field into account: tel = corsika+offset
     fMcEvt->SetTheta(fEvtHeader->GetZd());

trunk/MagicSoft/Mars/readcorsika.cc

@@ -40 +40 @@
     gLog << "   readcorsika [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
+    gLog << "   -ff                       Force reading of file even if problems occur" << endl;
     gLog.Usage();
 //    gLog << "     -f:  force reading of runheader" << endl;
@@ -70 +71 @@
     const Int_t  kCompLvl = arg.GetIntAndRemove("--comp=", 1);
     const Bool_t kForce   = arg.HasOnlyAndRemove("-f");
+    const Bool_t kForceRd = arg.HasOnlyAndRemove("-ff");
 
     //
@@ -145 +147 @@
     //
     MCorsikaRead read(kNamein);
+    read.SetForceMode(kForceRd);
     tasks.AddToList(&read);