Changeset 8674 for trunk/MagicSoft/Mars/mhflux

Timestamp:

08/18/07 12:04:44 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhflux

Files:

• MHCollectionArea.cc (modified) (3 diffs)
• MMcSpectrumWeight.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -183 +183 @@
     MH::SetBinning(&fHistAll, &binst, &binse);
 
-    fMcAreaRadius = -1;
+    fMcAreaRadius   = -1;
+    fCorsikaVersion =  0;
 
     return kTRUE;
@@ -205 +206 @@
 
     if (fCorsikaVersion!=0 && fCorsikaVersion!=runheader->GetCorsikaVersion())
-        *fLog << warn << "Warning - Read files have different Corsika versions..." << endl;
+    {
+        *fLog << warn;
+        *fLog << "Warning - Read files have different Corsika versions..." << endl;
+        *fLog << "          Last file=" << fCorsikaVersion << "   New file=" << runheader->GetCorsikaVersion() << endl;
+    }
     fCorsikaVersion = runheader->GetCorsikaVersion();
 
@@ -285 +290 @@
         //                         GetCollectionAreaAbs(), fMcAreaRadius);
         const TString txt = Form("r_{max}=%.0fm --> A_{max}=%.0fm^{2}",
-                                 GetCollectionAreaAbs(), fMcAreaRadius);
+                                 fMcAreaRadius, GetCollectionAreaAbs());
 
         TLatex text(0.31, 0.95, txt);

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -254 +254 @@
 // are equal only fNorm is returned.
 //
-// The normalization constant is returned as %.16f
+// The normalization constant is returned as %.16e
 //
 // Example: 0.3712780019*(pow(MMcEvt.fEnergy,-2.270))/(pow(MMcEvt.fEnergy,-2.600))
@@ -261 +261 @@
 {
     if (GetFormulaSpecOld()==GetFormulaSpecNew())
-        return Form("%.16f", fNorm);
+        return Form("%.16e", fNorm);
 
     const Double_t iold = fNormEnergy<0 ? GetSpecOldIntegral() : CalcSpecOld(fNormEnergy);
@@ -268 +268 @@
     const Double_t norm = fNorm*iold/inew;
 
-    return Form("%.16f*(%s)/(%s)", norm, GetFormulaSpecNew().Data(), GetFormulaSpecOld().Data());
+    return Form("%.16e*(%s)/(%s)", norm, GetFormulaSpecNew().Data(), GetFormulaSpecOld().Data());
 }
 
@@ -447 +447 @@
     if (fWeightsZd)
     {
+        /*
+         const Int_t i = fWeightsZd->GetXaxis()->FindFixBin(fPointing->GetZd());
+
+         Double_t tmin = fWeightsZd->GetXaxis()->GetBinLowEdge(i)  *TMath::DegToRad();
+         Double_t tmax = fWeightsZd->GetXaxis()->GetBinLowEdge(i+1)*TMath::DegToRad();
+         Double_t wdth = fWeightsZd->GetXaxis()->GetBinWidth(i)    *TMath::DegToRad();
+
+         Double_t cont = fWeightsZd->GetBinContent(i);
+
+         Double_t integ = cos(tmin)-cos(tmax);
+
+         w = sin(tmax)*cont/integ*wdth;
+         */
+
         const Int_t i = fWeightsZd->GetXaxis()->FindFixBin(fPointing->GetZd());
         w = fWeightsZd->GetBinContent(i);