Changeset 1032

Timestamp:

11/06/01 13:27:04 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (3 diffs)
• Mars/Makefile.conf.linux (modified) (1 diff)
• Mars/Makefile.conf.linux-gnu (modified) (1 diff)
• Mars/macros/readCT1.C (modified) (2 diffs)
• Mars/manalysis/MCerPhotCalc.cc (modified) (3 diffs)
• Mars/manalysis/MCerPhotEvt.cc (modified) (9 diffs)
• Mars/manalysis/MCerPhotEvt.h (modified) (2 diffs)
• Mars/mbase/MReadTree.cc (modified) (4 diffs)
• Mars/mraw/MRawEvtData.cc (modified) (3 diffs)
• Mars/mraw/MRawEvtData.h (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.cxx (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (1 diff)
• include-Classes/MMcFormat/MMcTrig.cxx (modified) (2 diffs)
• include-Classes/MMcFormat/MMcTrig.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
  2001/11/06: Thomas Bretz
+
+   * Makefile.conf.linux, Makefile.conf.linux-gnu:
+     - removed -g flag
 
    * mraw/MRawCrateArray.[h,cc]:
@@ -13 +16 @@
      - changed so, that the arrays are dreed and allocated only
        as less as possible
+     - removed (by comment) AddPixel
 
    * mraw/MRawFileRead.[h,cc]:
@@ -23 +27 @@
      - removed '.' from Branch names (each tree contains only one master
        branch with equal subbranches)
+
+   * macros/readCT1.C:
+     - fixed a small bug
+
+   * manalysis/MCerPhotCalc.cc:
+     - removed Clear from Process (done by Reset now)
+
+   * manalysis/MCerPhotEvt.[h,cc]:
+     - added reset-function
+     - some small changes to the code layout
+
+   * mmc/MMcFadcHeader.[h,cc], mmc/MMcTrig.[h,cc]:
+     - chenged constructor to support fName and fTitle
+
+   * mbase/MReadTree.cc:
+     - removes '.' from a branch name now before searching/creating the object
 
 

trunk/MagicSoft/Mars/Makefile.conf.linux

@@ -20 +20 @@
 #
 
-OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs 
-DEBUG    = -g
+OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
+DEBUG    =
 ARCHDEF  = -D__LINUX__
 

trunk/MagicSoft/Mars/Makefile.conf.linux-gnu

@@ -21 +21 @@
 
 OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs 
-DEBUG    = -g
+DEBUG    =
 ARCHDEF  = -D__LINUX__
 

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -32 +32 @@
     MTaskList   tlist;
 
-    plist->AddToList(&geomcam);
-    plist->AddToList(&hillas);
-    plist->AddToList(&tlist);
+    plist.AddToList(&geomcam);
+    plist.AddToList(&hillas);
+    plist.AddToList(&tlist);
 
-    MCT1ReadAscii read("CT1_99_off1.dat");
+    MCT1ReadAscii read("data/CT1_97_off1.dat");
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
@@ -54 +54 @@
     Int_t icount = 0;
     MCamDisplay display(&geomcam);
-        display.DrawPhotNum(&phevt);
-
+    display.Draw();
 
     while (read.Process())

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -62 +62 @@
 
     AddToBranchList("fHiGainPixId");
-    //AddToBranchList("fLoGainPixId");
+    AddToBranchList("fLoGainPixId");
     AddToBranchList("fHiGainFadcSamples");
-    //AddToBranchList("fLoGainFadcSamples");
+    AddToBranchList("fLoGainFadcSamples");
+
 }
 
@@ -77 +78 @@
 //  - MCerPhotEvt
 //
-Bool_t MCerPhotCalc::PreProcess( MParList *pList )
+Bool_t MCerPhotCalc::PreProcess(MParList *pList)
 {
     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
@@ -107 +108 @@
 Bool_t MCerPhotCalc::Process()
 {
-    fCerPhotEvt->Clear();
-
     MRawEvtPixelIter pixel(fRawEvt);
 
     while (pixel.Next())
     {
+
         const UInt_t pixid = pixel.GetPixelId();
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -44 +44 @@
 MCerPhotEvt::MCerPhotEvt(const char *name, const char *title) : fNumPixels(0)
 {
-
-  fName  = name  ? name  : "MCerPhotEvt";
-  fTitle = title ? title : "(Number of Photon)-Event Information";
-  
-  fPixels = new TClonesArray ("MCerPhotPix", 577) ;
-
-  //
-  // FIXME: is this really necessary?
-  //
-  fPixels->Clear();
+    fName  = name  ? name  : "MCerPhotEvt";
+    fTitle = title ? title : "(Number of Photon)-Event Information";
+
+    fPixels = new TClonesArray ("MCerPhotPix", 577);
+
+    //
+    // FIXME: is this really necessary?
+    //
+    Reset();
 }
 
@@ -82 +81 @@
 {
     // TClonesArray -> 'operator new with placement' should be used
+
+    fPixels->ExpandCreate(fNumPixels);
     new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
 }
@@ -89 +90 @@
 // reset counter and delete netries in list.
 //
-void MCerPhotEvt::Clear(Option_t *)
+void MCerPhotEvt::Reset()
 {
     fNumPixels = 0;
-    fPixels->Clear();
+//    fPixels->Delete();
 }
 
@@ -108 +109 @@
         << endl ;
 
-    for (Int_t il=0; il<entries; il++ )
-        (*this)[il].Print();
+    for (Int_t i=0; i<entries; i++ )
+        (*this)[i].Print();
 }
 
@@ -120 +121 @@
     const Int_t entries = fPixels->GetEntries();
 
-    for (Int_t il=0; il<entries; il++)
-    {
-        if (id == (*this)[il].GetPixId())
+    for (Int_t i=0; i<entries; i++)
+    {
+        if (id == (*this)[i].GetPixId())
             return kTRUE;
     }
@@ -137 +138 @@
     const Int_t entries = fPixels->GetEntries();
 
-    for (Int_t il=0; il<entries; il++)
-    {
-        MCerPhotPix &pix = (*this)[il];
+    for (Int_t i=0; i<entries; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
 
         if (id == pix.GetPixId() && pix.IsPixelUsed())
@@ -156 +157 @@
     const Int_t entries = fPixels->GetEntries();
 
-    for (Int_t il=0; il<entries; il++)
-    {
-        MCerPhotPix &pix = (*this)[il];
+    for (Int_t i=0; i<entries; i++)
+    {
+        const MCerPhotPix &pix = (*this)[i];
 
         if (id == pix.GetPixId() && pix.IsCorePixel())
@@ -178 +179 @@
     Float_t minval = (*this)[0].GetNumPhotons();
 
-    Float_t testval;
     for (UInt_t i=1; i<fNumPixels; i++)
     {
-        testval = (*this)[i].GetNumPhotons();
+        const Float_t testval = (*this)[i].GetNumPhotons();
 
         if (testval < minval)
@@ -201 +201 @@
     Float_t maxval = (*this)[0].GetNumPhotons();
 
-    Float_t testval;
     for (UInt_t i=1; i<fNumPixels; i++)
     {
-        testval = (*this)[i].GetNumPhotons();
+        const Float_t testval = (*this)[i].GetNumPhotons();
 
         if (testval > maxval)

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -21 +21 @@
     ~MCerPhotEvt() { delete fPixels; }
 
-    void Draw(Option_t* option = "");
-
     UInt_t GetNumPixels() const { return fNumPixels; }
-
-    void AddPixel(Int_t id, Float_t nph, Float_t err);
-
-    void Clear(Option_t *opt=NULL);
-    void Print(Option_t *opt=NULL) const;
+    void   AddPixel(Int_t id, Float_t nph, Float_t err);
 
     Bool_t  IsPixelExisting(Int_t id) const;
@@ -40 +34 @@
     MCerPhotPix &operator[](int i) const { return *(MCerPhotPix*)(fPixels->At(i)); }
 
+    void Reset();
+
+    void Draw(Option_t* option = "");
+    void Print(Option_t *opt=NULL) const;
+    void Clear(Option_t *opt=NULL) { Reset(); }
+
     ClassDef(MCerPhotEvt, 1)    // class for an event containing cerenkov photons
 };

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -302 +302 @@
     {
         //
-        // Get Name of Branch
-        //
-        const char *name = branch->GetName();
+        // Get Name of Branch and Object
+        //
+        const char *bname = branch->GetName();
+
+        TString oname(bname);
+
+        if (oname.EndsWith("."))
+            oname.Remove(oname.Length()-1);
 
         //
         // Check if enabeling the branch is allowed
         //
-        if (fVetoList->FindObject(name))
+        if (fVetoList->FindObject(oname))
         {
-            *fLog << "Master branch " << name << " has veto... skipped." << endl;
+            *fLog << "Master branch " << bname << " has veto... skipped." << endl;
             DisableSubBranches(branch);
             continue;
@@ -326 +331 @@
         // check if object is existing in the list
         //
-        *pcont=pList->FindCreateObj(name);
+        *pcont=pList->FindCreateObj(oname);
 
         if (!*pcont)
@@ -334 +339 @@
             // we cannot proceed reading this branch
             //
-            *fLog << dbginf << "Warning: Class '" << name << "' not existing in dictionary. Branch skipped." << endl;
+            *fLog << dbginf << "Warning: Class '" << oname << "' not existing in dictionary. Branch skipped." << endl;
             DisableSubBranches(branch);
             continue;
@@ -343 +348 @@
         // the actual branch should be stored - enable branch.
         //
-        fChain->SetBranchAddress(name, pcont);
-
-        *fLog << "Master branch address " << name << " setup for reading." << endl;
+        fChain->SetBranchAddress(bname, pcont);
+        *fLog << "Master branch address " << bname << " setup for reading." << endl;
+
+        //*fLog << "Branch " << bname << " autodel: " << (int)branch->IsAutoDelete() << endl;
+        branch->SetAutoDelete();
 
         num++;

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -350 +350 @@
     fPosInArray = 0;
 }
-
+/*
 // --------------------------------------------------------------------------
 //
@@ -370 +370 @@
     if (nSamp && ns!=nSamp)
     {
-        *fLog << "RawEvtData::FillPixel: Error, number of samples in ";
+        *fLog << "RawEvtData::AddPixel: Error, number of samples in ";
         *fLog << "TArrayC doesn't match actual number" << endl;
         return;
@@ -395 +395 @@
     arrsam->AddAt((Byte_t*)data->GetArray(), arrsam->GetSize()-ns, ns);
 }
-
+*/
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mraw/MRawEvtData.h

@@ -52 +52 @@
     void DeletePixels(Bool_t flag=kFALSE);
     void ResetPixels() { DeletePixels(kTRUE); }
-    void AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag=kFALSE);
+    // void AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag=kFALSE);
 
     Byte_t   GetNumHiGainSamples() const;

trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx

@@ -17 +17 @@
 
 
-MMcFadcHeader::MMcFadcHeader() {
+MMcFadcHeader::MMcFadcHeader(const char *name, const char *title) {
   //
   //  default constructor
+
+  fName  = name  ? name  : "MMcFadcHeader";
+  fTitle = title ? title : "Fadc Header Information from Monte Carlo";
+
   //  set all values to zero
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx

@@ -23 +23 @@
 
  public:
-  MMcFadcHeader() ;
+  MMcFadcHeader(const char *name=NULL, const char *title=NULL);
 
   ~MMcFadcHeader(); 

trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx

@@ -17 +17 @@
 
 
-MMcTrig::MMcTrig() {
+MMcTrig::MMcTrig(const char *name, const char *title) {
   //
   //  default constructor
@@ -23 +23 @@
 
   
-  fName  = "MMcTrig";
-  fTitle = "Trigger info from Monte Carlo";
+  fName  = name  ? name  : "MMcTrig";
+  fTitle = title ? title : "Trigger info from Monte Carlo";
 
     

trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx

@@ -21 +21 @@
 
  public:
-  MMcTrig() ;
+  MMcTrig(const char *name=NULL, const char *title=NULL);
 
   ~MMcTrig();