Changeset 2448

Timestamp:

10/31/03 18:32:36 (21 years ago)

Author:

marcos

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/weights.C (added)
• mhist/MFillH.cc (modified) (1 diff)
• mmontecarlo/MMcWeightEnergySpecCalc.cc (added)
• mmontecarlo/MMcWeightEnergySpecCalc.h (added)
• mmontecarlo/Makefile (modified) (1 diff)
• mmontecarlo/MonteCarloLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+ 2003/10/31: Marcos Lopez
+
+   * mhist/MFill.cc:
+     - Fixed a bug in function PreProcess(MParList *pList). Inside the 
+       conditional sentence "if (!fWeight && !fWeightName.IsNull())",  
+       fWeight never pointed to the object MWeight recoverd from the 
+       parameter list.
+  
+    * mhistmc/MHMcEnergyImpact.cc  
+      - In the Fill function, pass the weight to the histogram fHist.
+
+   * mmontecarlo/MMcWeightEnergySpecCalc.[h,cc] 
+      - Added new class for changing the energy spectrum of the showers 
+        simulated with Corsika to a different one, be using weights   
+                        
+   * mmontecarlo/Makefile, MonteCarloLinkDef.h
+      - Added the new class.
+ 
+   * macros/weights.C
+      - Added macro showing how to transform the spectrum of the MC showers.
+
+
+
   2003/10/31: Thomas Bretz
 

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -383 +383 @@
     {
         fWeight = (MWeight*)pList->FindObject(fWeightName, "MWeight");
-        *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
-        return kFALSE;
+
+        if (!fWeight)
+          {
+            *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
+            return kFALSE;
+          }
     }
 

trunk/MagicSoft/Mars/mmontecarlo/Makefile

@@ -32 +32 @@
            MMcTimeGenerate.cc \
            MMcTriggerRateCalc.cc \
-           MMcEnergyEst.cc
+           MMcEnergyEst.cc \
+           MMcWeightEnergySpecCalc.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MMcTriggerRateCalc+;
 #pragma link C++ class MMcEnergyEst+;
+#pragma link C++ class MMcWeightEnergySpecCalc+;
+
 #endif