Changeset 2529 for trunk/MagicSoft/Mars

Timestamp:

11/19/03 00:03:53 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MArgs.cc (modified) (1 diff)
• mbase/MArgs.h (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mbase/MTime.h (modified) (2 diffs)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (1 diff)
• mhist/MHEvent.cc (modified) (1 diff)
• mraw/MRawSocketRead.cc (modified) (2 diffs)
• mreport/MReport.cc (modified) (2 diffs)
• mreport/MReport.h (modified) (3 diffs)
• mreport/MReportFileRead.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -3 +3 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/18: Thomas Bretz
+
+   * mars.cc:
+     - changed Usage to standard Usage
+     
+   * merpp.cc, mona.cc, readraw.cc, star.cc, status.cc,
+     mbase/MArgs.[h,cc]:
+     - removed const-qualifier for argv
+     
+   * mbase/MTask.cc:
+     - fixed a bug in PrintStatistics (setfill was not set)
+     
+   * mbase/MTaskList.cc:
+     - simplified PrintStatistics
+   
+   * mbase/MTime.h:
+     - added Getter
+     
+   * mfileio/MReadTree.cc:
+     - remove a leading "*" when checking whether a branch which 
+       should be enabled exists
+       
+   * mfileio/MWriteRootFile.cc:
+     - fixed a crash when Print is called and GetTree() returns NULL
+     
+   * mhist/MHEvent.cc:
+     - implemented more levels (MeV, GeV, etc) for energy display
+     
+   * mraw/MRawSocketRead.cc:
+     - removed some obsolete comment
+     
+   * mreport/MReport.[h,cc]:
+     - added FindTime
+     - removed an invalid line (ReadAngle) in the header file
+     - Set class version to 1
+     - do not write fTime '//!'
+     
+   * mreport/MReportFileRead.cc:
+     - fixed handling of MTimes
+
+
+
  2003/11/18: Abelardo Moralejo
 
@@ -8 +50 @@
      - Fixed missing initialization of fLongitmax
 
+
+
  2003/11/18: Markus Gaug
 
    * manalysis/MCalibrationCalc: 
-        - performs the eventloop and fills the calibration classes
+     - performs the eventloop and fills the calibration classes
 
    * manalysis/MCalibrationCam: 
-        - holds the classes: MCalibrationPix and MCalibrationBlindPix and MCalibrationPINDiode
-        - one MCalibrationPix per pixel
+     - holds the classes: MCalibrationPix and MCalibrationBlindPix
+       and MCalibrationPINDiode
+     - one MCalibrationPix per pixel
 
    * manalysis/MCalibrationPix:
-        - holds the fit results and conversion factors, etc per pixel
-        - hold histograms MHCalibrationPixel
+     - holds the fit results and conversion factors, etc per pixel
+     - hold histograms MHCalibrationPixel
 
    * manalysis/MCalibrationBlindPix:
-        - holds fit results and derived number of photons, etc
-        - hold histogram MHCalibrationBlindPixel
+     - holds fit results and derived number of photons, etc
+     - hold histogram MHCalibrationBlindPixel
 
    * manalysis/MCalibrationPINDiode:
-        - holds fit results and derived number of photons, etc
-        - hold histogram MHCalibrationPINDiode
+     - holds fit results and derived number of photons, etc
+     - hold histogram MHCalibrationPINDiode
 
    * mhist/MHCalibrationPix:
-        - histograms with sum of charges, time slices and reduced charges vs. event number
-        - fit functions
+     - histograms with sum of charges, time slices and reduced
+       charges vs. event number
+     - fit functions
 
    * mhist/MHCalibrationPixel:
-        - histograms with sum of charges, time slices and reduced charges vs. event number
-        - fit functions
+     - histograms with sum of charges, time slices and reduced
+       charges vs. event number
+     - fit functions
 
    * mhist/MHCalibrationBlindPixel:
-        - histograms with sum of charges, time slices and reduced charges vs. event number
-        - fit functions
+     - histograms with sum of charges, time slices and reduced
+       charges vs. event number
+     - fit functions
 
    * mhist/MHCalibrationPINDiode:
-        - histograms with sum of charges, time slices and reduced charges vs. event number
-        - fit functions
-
-   *mhist/MH:
-        - new function: CutEdges
-
-   *macros/calibration.C
-        - simple macro showing the functionning
-
- 
+     - histograms with sum of charges, time slices and reduced
+       charges vs. event number
+     - fit functions
+
+   * mhist/MH:
+     - new function: CutEdges
+
+   * macros/calibration.C
+     - simple macro showing the functionning
+
+
+
  2003/11/17: Thomas Bretz
  

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -54 +54 @@
 //  fArgv: A TList containing all other command line arguments
 //
-MArgs::MArgs(int argc, const char **argv) : fArgc(argc)
-{
+MArgs::MArgs(int argc, char **argv) : fArgc(argc)
+{
+    // FIXME: argv has no const-qualifier to be idetical with
+    //        TApplication.
     fName = argv[0];
 

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -31 +31 @@
 
 public:
-    MArgs(int argc, const char **argv);
+    MArgs(int argc, char **argv);
     ~MArgs();
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -328 +328 @@
 void MTask::PrintStatistics(const Int_t lvl, Bool_t title) const
 {
-    *fLog << all << setw(lvl) << " " << GetDescriptor() << "\t";
+    *fLog << all << setfill(' ') << setw(lvl) << " " << GetDescriptor() << "\t";
     *fLog << dec << fNumExecutions;
     if (fFilter)

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -592 +592 @@
     }
     else
-    {
-        *fLog << setw(lvl) << " " << GetDescriptor();
-        if (title)
-            *fLog << "\t" << fTitle;
-        *fLog << endl;
-    }
+        MTask::PrintStatistics(lvl, title);
 
     //

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -83 +83 @@
     }
 
-    void SetTime(Byte_t h, Byte_t m, Byte_t s, UShort_t ns)
+    void SetTime(Byte_t h, Byte_t m, Byte_t s, UInt_t ns)
     {
         fHour    = h;
@@ -114 +114 @@
         return operator double();
     }
+
+    Byte_t GetHour() const { return fHour; }
+    Byte_t GetMin() const { return fMin; }
+    Byte_t GetSec() const { return fSec; }
+    UInt_t GetNanoSec() const { return fNanoSec; }
 
     ClassDef(MTime, 2)  //A generalized MARS time stamp

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -409 +409 @@
     // Check whether this branch really exists
     //
-    if (fChain->GetBranch(name))
+    TString bn(name);
+    if (bn.EndsWith("*"))
+        bn.Remove(bn.Length()-1);
+
+    if (fChain->GetBranch(bn))
         SetBranchStatus(name, status);
 
@@ -905 +909 @@
 }
 
+TString MReadTree::GetTreeName() const
+{
+    return fChain->GetName();
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -161 +161 @@
         MRootFileBranch *b = (MRootFileBranch*)obj;
 
-        if (b->GetTree()->TestBit(kIsNewTree))
+        if (!b->GetTree() || b->GetTree()->TestBit(kIsNewTree))
             continue;
 

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -226 +226 @@
         s.Insert(0, txt);
 
-        s += "}{";
-        s += "  E=";
+        s += "}{  E=";
+
         if (fMcEvt->GetEnergy()>1000)
             s += Form("%.1fTeV", fMcEvt->GetEnergy()/1000);
         else
-            s += Form("%dGeV", fMcEvt->GetEnergy()+.5);
+            if (fMcEvt->GetEnergy()>10)
+                s += Form("%dGeV", (Int_t)(fMcEvt->GetEnergy()+.5));
+            else
+                if (fMcEvt->GetEnergy()>1)
+                    s += Form("%.1fGeV", fMcEvt->GetEnergy());
+                else
+                    s += Form("%dMeV", (Int_t)(fMcEvt->GetEnergy()*1000+.5));
+
         s += " r=";
         s += (int)(fMcEvt->GetImpact()/100+.5);
-        s += "m ZA=";
+        s += "m Zd=";
         s += (int)(fMcEvt->GetTheta()*180/TMath::Pi()+.5);
-        s += "\xb0 ";
-        s += fMcEvt->GetPhotElfromShower();
-        s += "PhEl";
-        s += "}";
+        s += "\\circ ";
+        if (fMcEvt->GetPhotElfromShower()>=10000)
+            s += Form("%dk", (Int_t)(fMcEvt->GetPhotElfromShower()/1000.+.5));
+        else
+            if (fMcEvt->GetPhotElfromShower()>=1000)
+                s += Form("%.1fk", fMcEvt->GetPhotElfromShower()/1000.);
+            else
+                s += fMcEvt->GetPhotElfromShower();
+        s += "PhEl}";
     }
 

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -135 +135 @@
 
     *fLog << err << "ERROR - Cannot open port #" << fPort << endl;
+
     return kFALSE;
 }
@@ -187 +188 @@
     fEvtNumber = (UInt_t)-1;
 
-    /*
-    MEvtLoop *loop=(MEvtLoop*)pList->FindObject("Evtloop");
-    if (loop)
-        loop->SetProgressBar((TGProgressBar*)NULL);
-     */
     return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -33 +33 @@
 
 #include "MTime.h"
+#include "MParList.h"
 
 ClassImp(MReport);
@@ -82 +83 @@
     return kTRUE;
 }
+
+MTime *MReport::FindTime(MParList &plist)
+{
+    fTime = NULL;
+
+    TString id(ClassName());
+    if (!id.BeginsWith("MReport"))
+    {
+        *fLog << warn << " WARNING - Class name '" << id << "' ";
+        *fLog << " doesn't begin with 'MReport'... no MTime assigned." << endl;
+        return NULL;
+    }
+
+    id.Remove(0, 7);
+    if (id.IsNull())
+    {
+        *fLog << warn << " WARNING - No postfix existing... no MTime assigned." << endl;
+        return NULL;
+    }
+
+    id.Prepend("MTime");
+
+    fTime = (MTime*)plist.FindCreateObj("MTime", id);
+    return fTime;
+}

trunk/MagicSoft/Mars/mreport/MReport.h

@@ -7 +7 @@
 
 class MTime;
+class MParList;
 
 class MReport : public MParContainer
@@ -14 +15 @@
 
     Byte_t  fState;
-    MTime  *fTime;
+    MTime  *fTime;             //!
 
     ULong_t Hash() const { return fIdentifier.Hash(); }
@@ -39 +40 @@
     void SetTime(MTime *t) { fTime = t; }
 
-    static Bool_t ReadAngle(TString &str, Double_t &ret);
+    MTime *FindTime(MParList &plist);
 
-    ClassDef(MReport, 0) // Base class for control reports
+    ClassDef(MReport, 1) // Base class for control reports
 };
 

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -60 +60 @@
     ULong_t Hash() const { return fReport->GetIdentifier().Hash(); }
     MReport *GetReport() { return fReport; }
-    void SetTime(MTime *t) { fReport->SetTime(t); }
+    //void SetTime(MTime *t) { fReport->SetTime(t); }
     Bool_t Interprete(TString &str)
     {
@@ -69 +69 @@
         return kTRUE;
     }
+    void SetTime(MParList &plist) { fReport->FindTime(plist); }
+    void AddToList(MParList &plist) { plist.AddToList(fReport); }
 };
 
@@ -178 +180 @@
 Int_t MReportFileRead::PreProcess(MParList *pList)
 {
-    MTime *time = (MTime*)pList->FindCreateObj("MTime");
-    if (!time)
-        return kFALSE;
-
-    fList->ForEach(MReportHelp, SetTime)(time);
+    //MTime *time = (MTime*)pList->FindCreateObj("MTime");
+    //if (!time)
+    //    return kFALSE;
+
+    fList->ForEach(MReportHelp, SetTime)(*pList);
+    fList->ForEach(MReportHelp, AddToList)(*pList);
 
     //
@@ -249 +252 @@
     fIn->close();
 
+    if (!GetNumExecutions())
+        return kTRUE;
+
     *fLog << inf << endl;
     *fLog << GetDescriptor() << " statistics:" << endl;