Changeset 2009 for trunk/MagicSoft

Timestamp:

04/24/03 16:06:08 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/dohtml.C (modified) (2 diffs)
• macros/rootlogon.C (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mfilter/MFEnergySlope.h (modified) (2 diffs)
• mhist/MHThetabarTime.cc (modified) (1 diff)

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -46 +46 @@
     sourcedir += "mgui:";
     sourcedir += "mhist:";
+    sourcedir += "mhistmc:";
+    sourcedir += "mimage:";
     sourcedir += "mmain:";
     sourcedir += "mmc:";
@@ -80 +82 @@
     html.Convert("starplot.C",      "MARS - Plots data from a STAR-file into a mars histogram");
     html.Convert("testenv.C",       "MARS - Example to use TEnv and Mars Eventloops");
-    html.Convert("triglvl2.C",       "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms");
+    html.Convert("triglvl2.C",      "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms");
+    html.Convert("status.C",        "MARS - Example to use the online display");
 }

trunk/MagicSoft/Mars/macros/rootlogon.C

@@ -100 +100 @@
     gInterpreter->AddIncludePath(dir+"mhist");
     gInterpreter->AddIncludePath(dir+"mhistmc");
+    gInterpreter->AddIncludePath(dir+"mimage");
     gInterpreter->AddIncludePath(dir+"mmain");
     gInterpreter->AddIncludePath(dir+"mmc");

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -368 +368 @@
         gSystem->ProcessEvents();
 #else
-        gClient->ProcessEventsFor(fDisplay ? fDisplay : fProgress);
+        gClient->ProcessEventsFor(fDisplay ? fDisplay->GetBar() : fProgress);
 #endif
     }

trunk/MagicSoft/Mars/mfilter/MFEnergySlope.h

@@ -4 +4 @@
 //                                                                         //
 // MFEnergySlope                                                           //
-//                                                                         //
-// auth. A.stamerra                                                        //
-// created 30.01.03                                                        //
 //                                                                         //
 /////////////////////////////////////////////////////////////////////////////
@@ -21 +18 @@
 {
 private:
+    Int_t fNumSelectedEvts; // counter for number of selected events
 
-  Int_t fNumSelectedEvts;
-  Int_t fErrors[2];
+    MMcEvt *fEvt;           // Events used to determin energy slope
 
-    MMcEvt *fEvt;
-    //    MMcCorsikaRunHeader *fMcRunHeader;
+    Bool_t fResult;         // Result returned by IsExpressionTrue
+    Float_t fNewSlope;      // New slope set by user
 
-    Bool_t fResult;        
-    Float_t fNewSlope;     // New slope set by user 
+    Float_t fMcSlope;       // Original energy slope from MC data
+    Float_t fMcMinEnergy;   // Starting energy of MC data
+    Float_t fMcMaxEnergy;   // Ending energy of MC data
 
-    Float_t fMcSlope;     // Original energy slope from MC data
-    Float_t fMcMinEnergy; // Starting energy of MC data
-    Float_t fMcMaxEnergy; // Ending energy of MC data
-
-    Float_t fN0; // Normalization factor
-
-    //    void Init(const Float_t val,
-    //          const char *name, const char *title);
+    Float_t fN0;            // Normalization factor
 
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();
-    Bool_t PostProcess();
 
 public:
-
-    //    MFEnergySlope(const char *name=NULL, const char *title=NULL);
-    //    MFEnergySlope();
     MFEnergySlope(const char *name=NULL, const char *title=NULL);
 

trunk/MagicSoft/Mars/mhist/MHThetabarTime.cc

@@ -119 +119 @@
 // Fill the histogram
 //
-Bool_t MHThetabarTime::Fill(const MParContainer *par)
+Bool_t MHThetabarTime::Fill(const MParContainer *par, Double_t w)
 {
     const Int_t time = fTime->GetTimeLo();