Changeset 6915 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

04/07/05 14:27:22 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcWeightEnergySpecCalc.cc (modified) (4 diffs)
• MMcWeightEnergySpecCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mmontecarlo/MMcWeightEnergySpecCalc.cc

@@ -82 +82 @@
 //                                            
 //  Output Container:                        
-//   MWeight  
+//   MWeight [MParameterD]
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -94 +94 @@
 #include "MMcRunHeader.hxx"
 #include "MMcCorsikaRunHeader.h"
-#include "MWeight.h"
+#include "MParameters.h"
 
 #include "TF1.h"
@@ -232 +232 @@
       }
 
-    fWeight = (MWeight*)pList->FindCreateObj("MWeight");
+    fWeight = (MParameterD*)pList->FindCreateObj("MParameterD", "MWeight");
     if (!fWeight)
-      {
-        *fLog << err << dbginf << "MWeight not found... exit." << endl;
         return kFALSE;
-      }
     
     return kTRUE;
@@ -347 +344 @@
 
     const Double_t C = fCorSpecInt / fNewSpecInt;
-    Double_t weight;
+    Double_t weight = C;
 
 
     if (fNewSpecIsPowLaw)   
-      weight = C * pow(energy,fNewSlope-fCorsikaSlope);
+        weight *= pow(energy,fNewSlope-fCorsikaSlope);
     else
-      weight = C * fNewSpectrum->Eval(energy) / pow(energy,fCorsikaSlope);
+        weight *= fNewSpectrum->Eval(energy) / pow(energy,fCorsikaSlope);
      
 
-    fWeight->SetWeight( weight );
+    fWeight->SetVal(weight);
 
     return kTRUE;

trunk/MagicSoft/Mars/mmontecarlo/MMcWeightEnergySpecCalc.h

@@ -9 +9 @@
 class MParList;
 class MMcEvt;
-class MWeight;
+class MParameterD;
 class TF1;
 
@@ -19 +19 @@
 
     const MMcEvt *fMcEvt;
-    MWeight  *fWeight;
+    MParameterD  *fWeight;
 
     TF1*     fNewSpectrum;     // Function with the new spectrum