Changeset 1003 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/29/01 11:15:53 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1ReadAscii.cc (modified) (5 diffs)
• MCerPhotCalc.cc (modified) (1 diff)
• MCerPhotEvt.cc (modified) (1 diff)
• MHillas.cc (modified) (1 diff)
• MHillasCalc.cc (modified) (1 diff)
• MImgCleanStd.cc (modified) (1 diff)
• MMcPedestalCopy.cc (modified) (1 diff)
• MPedCalcPedRun.cc (modified) (1 diff)
• MPedestalCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -43 +43 @@
 #include <fstream.h>
 
-#include <TArrayC.h>
+#include <TList.h>
 
 #include "MLog.h"
@@ -65 +65 @@
     : fIn(NULL)
 {
-    *fName  = name  ? name  : "MCT1ReadAscii";
-    *fTitle = title ? title : "Task to loop over events in CT1 ascii file";
+    fName  = name  ? name  : "MCT1ReadAscii";
+    fTitle = title ? title : "Task to loop over events in CT1 ascii file";
 
     //
     // remember file name for opening the file in the preprocessor
     //
-    fFileNames = new TArrayC;
+    fFileNames = new TList;
+    fFileNames->SetOwner();
+
     if (fname)
         AddFile(fname);
@@ -93 +95 @@
 void MCT1ReadAscii::AddFile(const char *txt)
 {
-    const int sz  = fFileNames->GetSize();
-    const int tsz = strlen(txt)+1;
-
-    fFileNames->Set(sz+tsz);
-
-    memcpy(fFileNames->GetArray()+sz, txt, tsz);
+    TNamed *name = new TNamed(txt, "");
+    fFileNames->AddLast(name);
 }
 
@@ -114 +112 @@
     fIn = NULL;
 
-    const int arrsz = fFileNames->GetSize();
-
-    if (arrsz<1)
+    //
+    // Check for the existance of a next file to read
+    //
+    TNamed *file = (TNamed*)fFileNames->First();
+    if (!file)
         return kFALSE;
 
@@ -122 +122 @@
     // open the file which is the first one in the chain
     //
-    const char *name = fFileNames->GetArray();
+    const char *name = file->GetName();
 
     fIn = new ifstream(name);
-    if (!(*fIn))
-    {
+
+    const Bool_t noexist = !(*fIn);
+
+    if (noexist)
         *fLog << dbginf << "Cannot open file '" << name << "'" << endl;
-        return kFALSE;
-    }
-
-    //
-    // remove the first entry from the chain
-    //
-    *fLog << "Open file: '" << name << "'" << endl;
-
-    //
-    // create the new char array containing the filenames to process
-    //
-    const int sz  = strlen(name)+1;
-
-    char *dummy = new char[arrsz-sz];
-    memcpy(dummy, name+sz, arrsz-sz);
-
-    //
-    // dummy will be deleted by the destructor of fFileNames
-    //
-    fFileNames->Adopt(arrsz-sz, dummy);
-
-    return kTRUE;
-
+    else
+        *fLog << "Open file: '" << name << "'" << endl;
+
+    //
+    // Remove this file from the list of pending files
+    //
+    fFileNames->Remove(file);
+
+    return !noexist;
 }
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -58 +58 @@
 MCerPhotCalc::MCerPhotCalc(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MCerPhotCalc";
-    *fTitle = title ? title : "Task to calculate Cerenkov photons from raw data";
+    fName  = name  ? name  : "MCerPhotCalc";
+    fTitle = title ? title : "Task to calculate Cerenkov photons from raw data";
 }
 

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -45 +45 @@
 {
 
-  *fName  = name  ? name  : "MCerPhotEvt";
-  *fTitle = title ? title : "(Number of Photon)-Event Information";
+  fName  = name  ? name  : "MCerPhotEvt";
+  fTitle = title ? title : "(Number of Photon)-Event Information";
   
   fPixels = new TClonesArray ("MCerPhotPix", 577) ;

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -60 +60 @@
 MHillas::MHillas(const char *name, const char *title) : fEllipse(NULL)
 {
-    *fName  = name  ? name  : "MHillas";
-    *fTitle = title ? title : "Storage container for Hillas parameter of one event";
+    fName  = name  ? name  : "MHillas";
+    fTitle = title ? title : "Storage container for Hillas parameter of one event";
 
     Reset();

trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

@@ -56 +56 @@
 MHillasCalc::MHillasCalc(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MHillasCalc";
-    *fTitle = title ? title : "Task to calculate Hillas parameters";
+    fName  = name  ? name  : "MHillasCalc";
+    fTitle = title ? title : "Task to calculate Hillas parameters";
 }
 

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -66 +66 @@
     : fCleanLvl1(lvl1), fCleanLvl2(lvl2)
 {
-    *fName  = name  ? name  : "MImgCleanStd";
-    *fTitle = title ? title : "Task which does a standard image cleaning";
+    fName  = name  ? name  : "MImgCleanStd";
+    fTitle = title ? title : "Task which does a standard image cleaning";
 
     *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl;

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -49 +49 @@
 MMcPedestalCopy::MMcPedestalCopy(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MMcPedestalCopy";
-    *fTitle = title ? title : "Task to copy monte carlo pedestals into MPedestal Container";
+    fName  = name  ? name  : "MMcPedestalCopy";
+    fTitle = title ? title : "Task to copy monte carlo pedestals into MPedestal Container";
 }
 

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -53 +53 @@
 MPedCalcPedRun::MPedCalcPedRun(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MPedCalcPedRun";
-    *fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data";
+    fName  = name  ? name  : "MPedCalcPedRun";
+    fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data";
 }
 

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -42 +42 @@
 MPedestalCam::MPedestalCam(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MPedestalCam";
-    *fTitle = title ? title : "Storage container for all Pedestal Information in the camera";
+    fName  = name  ? name  : "MPedestalCam";
+    fTitle = title ? title : "Storage container for all Pedestal Information in the camera";
 
     fArray = new TClonesArray("MPedestalPix", 577);