Changeset 1355

Timestamp:

06/10/02 09:09:13 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk

Files:

• MagicSoft/Mars/Changelog (modified) (1 diff)
• MagicSoft/Mars/mbase/MReadMarsFile.cc (modified) (1 diff)
• MagicSoft/Mars/mbase/MReadTree.cc (modified) (7 diffs)
• MagicSoft/Mars/mhist/MHMatrix.cc (modified) (2 diffs)
• MagicSoft/Mars/mhist/MHMatrix.h (modified) (1 diff)
• WuerzburgSoft/Thomas/mphys/phys.C (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
  2002/06/10: Thomas Bretz
+
+   * mbase/MReadMarsFile.cc:
+     - changed name of fRun to ReadRunHeaders
+
+   * mbase/MReadTree.cc:
+     - changed output to show name of class
 
    * macros/plot.C:

trunk/MagicSoft/Mars/mbase/MReadMarsFile.cc

@@ -63 +63 @@
     // open the input stream
     //
-    fRun = new MReadTree("RunHeaders", fname);
+    fRun = new MReadTree("RunHeaders", fname, "ReadRunHeaders");
 
     //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -193 +193 @@
 Bool_t MReadTree::Notify()
 {
-    *fLog << inf << "MReadTree: Notify '" << fChain->GetName() << "' ";
-    *fLog << "(before processing event #" << GetEventNum()-1 << ")" << endl;
+    *fLog << inf << GetDescriptor() << ": Notify '" << fChain->GetName();
+    *fLog << "' (before processing event #" << GetEventNum()-1 << ")" << endl;
 
     //fNotify->Notify();
@@ -237 +237 @@
         return;
 
-    *fLog << inf << "Branch choosing method enabled (only enabled branches are read)." << endl;
+    *fLog << inf << GetDescriptor() << ": Branch choosing method enabled (only enabled branches are read)." << endl;
     fChain->SetBranchStatus("*", kFALSE);
     fBranchChoosing = kTRUE;
@@ -341 +341 @@
     if (!tlist)
     {
-        *fLog << warn << "Cannot use auto enabeling scheme for branches. 'MTaskList' not found." << endl;
+        *fLog << warn << GetDescriptor() << "Cannot use auto enabeling scheme for branches. 'MTaskList' not found." << endl;
         return;
     }
@@ -537 +537 @@
     }
 
-    *fLog << inf << "MReadTree setup " << num << " master branches addresses." << endl;
+    *fLog << inf << GetDescriptor() << " setup " << num << " master branches addresses." << endl;
 
     //
@@ -674 +674 @@
     if (fNumEntry-dec >= fNumEntries)
     {
-        *fLog << warn << "MReadTree::DecEventNum: WARNING - Event " << fNumEntry << "-";
+        *fLog << warn << GetDescriptor() << ": DecEventNum, WARNING - Event " << fNumEntry << "-";
         *fLog << dec << "=" << (Int_t)fNumEntry-dec << " out of Range." << endl;
         return kFALSE;
@@ -692 +692 @@
     if (fNumEntry+inc >= fNumEntries)
     {
-        *fLog << warn << "MReadTree::IncEventNum: WARNING - Event " << fNumEntry << "+";
+        *fLog << warn << GetDescriptor() << ": IncEventNum, WARNING - Event " << fNumEntry << "+";
         *fLog << inc << "=" << (Int_t)fNumEntry+inc << " out of Range." << endl;
         return kFALSE;
@@ -712 +712 @@
     if (nr >= fNumEntries)
     {
-        *fLog << warn << "MReadTree::SetEventNum: WARNING - " << nr << " out of Range." << endl;
+        *fLog << warn << GetDescriptor() << ": SetEventNum, WARNING - " << nr << " out of Range." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -192 +192 @@
 Bool_t MHMatrix::Finalize()
 {
+    //
+    // It's not a fatal error so we don't need to stop PostProcessing...
+    //
+    if (fData->GetSize()<1 || fNumRow<1)
+        return kTRUE;
+
     TMatrix m(fM);
 
@@ -302 +308 @@
     const Int_t cols = m.GetNcols();
 
-    for (int i=0; i<cols; i++)
+    for (int x=0; x<cols; x++)
     {
         Double_t avg = 0;
-        for (int j=0; j<rows; j++)
-            avg += fM(j, i);
+        for (int y=0; y<rows; y++)
+            avg += fM(y, x);
 
         avg /= rows;
 
-        for (int j=0; j<rows; j++)
-            m(j, i) -= avg;
+        for (int y=0; y<rows; y++)
+            m(y, x) -= avg;
     }
 

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -39 +39 @@
     const TList *GetRules() const { return fRules; }
 
-    void SetEnergy(MHMatrix *m) { fEnergy = m; }
-
     //void Draw(Option_t *opt=NULL);
     //TObject *DrawClone(Option_t *opt=NULL) const;

trunk/WuerzburgSoft/Thomas/mphys/phys.C

@@ -700 +700 @@
     Double_t runtime = 15*60; ///*18*60*/60; // [s]
 
-    Double_t lo = 2e4;
+    Double_t lo = 2e5;
     Double_t hi = 2e10;
     Double_t alpha = -2;
@@ -745 +745 @@
     //
     hist.SetFillStyle(0);
-    hist.SetMarkerStyle(2);
+    hist.SetMarkerStyle(kPlus);
     histsrc.SetFillStyle(0);
-    histsrc.SetMarkerStyle(2);
+    histsrc.SetMarkerStyle(kMultiply);
 
     MBinning bins;
@@ -817 +817 @@
 
                     fcas << p->GetEnergy() << endl;
-
-                    listg.Remove(p);
+                    delete listg.Remove(p);
                     continue;
                 }
@@ -837 +836 @@
                 }
 
-                listg.Remove(p);
+                delete listg.Remove(p);
                 cout << "." << flush;
             }
@@ -905 +904 @@
     gPad->Clear();
 
-    histsrc.SetTitle(Form("E^%.1f, z=%f, T=%d'%d\", N=%d", alpha, startz, (int)runtime/60, (int)runtime%60, n));
+    hist.SetTitle(Form("E^%.1f, z=%f, T=%d'%d\", N=%d", alpha, startz, (int)runtime/60, (int)runtime%60, n));
+    gPad->Modified();
+    gPad->Update();
 
     hist.DrawCopy("P");