Changeset 8049 for trunk

Timestamp:

10/11/06 09:34:07 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibrationTestCalc.cc (modified) (1 diff)
• mhflux/MAlphaFitter.cc (modified) (1 diff)
• mhflux/MHCollectionArea.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc

@@ -205 +205 @@
 
   if (fGeom->InheritsFrom("MGeomCamMagic"))
-    {
-      *fLog << " " << setw(7) << "Not interpolateable Pixels: " 
-            << Form("%s%3i%s%3i","Inner: ",testcam->GetNumUninterpolated(0),
-                    " Outer: ",testcam->GetNumUninterpolated(1)) << endl;
-      *fLog << " " << setw(7) << "Biggest not-interpolateable cluster: " 
-            << maxbad << endl;
-    }
-  
+  {
+      *fLog << " Not interpolateable Pixels:";
+      *fLog << " Inner: " << Form("%3i", testcam->GetNumUninterpolated(0));
+      *fLog << " Outer: " << Form("%3i", testcam->GetNumUninterpolated(1)) << endl;
+      *fLog << " Biggest not-interpolateable cluster: " << maxbad << endl;
+  }
+
   testcam->SetNumUninterpolatedInMaxCluster(maxbad);
 

trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

@@ -326 +326 @@
 
     // Calculate arbitrary scale factor from propagated error from the
-    // condistion: sqrt(alpha*background) = est.background/est.error
+    // condition: sqrt(alpha*background) = est.background/est.error
     // const Double_t bg = hof.Integral(1, bin);
     // const Double_t sc = bg * er*er / (fit2.GetEventsBackground()*fit2.GetEventsBackground());

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -201 +201 @@
     }
 
-    if (fIsExtern)
-        return kTRUE;
-
-    fTotalNumSimulatedShowers += runheader->GetNumSimulatedShowers();
-    *fLog << inf << "Total Number of Simulated showers: " << fTotalNumSimulatedShowers << endl;
-
     if (fCorsikaVersion!=0 && fCorsikaVersion!=runheader->GetCorsikaVersion())
         *fLog << warn << "Warning - Read files have different Corsika versions..." << endl;
     fCorsikaVersion = runheader->GetCorsikaVersion();
+
+    if (fIsExtern)
+        return kTRUE;
+
+    fTotalNumSimulatedShowers += runheader->GetNumSimulatedShowers();
+    *fLog << inf << "Total Number of Simulated showers: " << fTotalNumSimulatedShowers << endl;
 
     fAllEvtsTriggered |= runheader->GetAllEvtsTriggered();