Changeset 666 for trunk/MagicSoft/Mars/mraw

Timestamp:

03/02/01 12:48:15 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawFileRead.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -84 +84 @@
     //  if not create one and add them to the list
     //
-    fRawRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+    fRawRunHeader = (MRawRunHeader*)pList->FindCreateObj("MRawRunHeader");
     if (!fRawRunHeader)
-    {
-        *fLog << "MRawFileRead::PreProcess - WARNING: MRawRunHeader not found... creating." << endl;
-        fRawRunHeader = new MRawRunHeader;
-        pList->AddToList(fRawRunHeader);
-    }
+        return kFALSE;
 
-    fRawEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
+    fRawEvtHeader = (MRawEvtHeader*)pList->FindCreateObj("MRawEvtHeader");
     if (!fRawEvtHeader)
-    {
-        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtHeader not found... creating." << endl;
-        fRawEvtHeader = new MRawEvtHeader;
-        pList->AddToList(fRawEvtHeader);
-    }
+        return kFALSE;
 
-    fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
+    fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData");
     if (!fRawEvtData)
-    {
-        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl;
-        fRawEvtData = new MRawEvtData;
-        pList->AddToList(fRawEvtData);
-    }
+        return kFALSE;
 
-    fRawCrateArray = (MRawCrateArray*)pList->FindObject("MRawCrateArray");
+    fRawCrateArray = (MRawCrateArray*)pList->FindCreateObj("MRawCrateArray");
     if (!fRawCrateArray)
-    {
-        *fLog << "MRawFileRead::PreProcess - WARNING: MRawCrateArray not found... creating." << endl;
-        fRawCrateArray = new MRawCrateArray;
-        pList->AddToList(fRawCrateArray);
-    }
+        return kFALSE;
 
-    fRawEvtTime = (MTime*)pList->FindObject("MRawEvtTime");
+    fRawEvtTime = (MTime*)pList->FindCreateObj("MRawEvtTime");
     if (!fRawEvtTime)
-    {
-        *fLog << "MRawFileRead::PreProcess - WARNING: MRawEvtTime not found... creating." << endl;
-        fRawEvtTime = new MTime("MRawEvtTime");
-        pList->AddToList(fRawEvtTime);
-    }
+        return kTRUE;
 
     //