Changeset 18572 for trunk/Mars/mraw

Timestamp:

09/03/16 20:42:24 (8 years ago)

Author:

tbretz

Message:

Also retrieve the name of the container from the file and create the container accordingly. Inplemented an error message.

File:

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

trunk/Mars/mraw/MRawFitsRead.cc

@@ -183 +183 @@
             break;
 
-        const string clname = fin.GetStr(clnamed);
-
-        MParContainer *par = (MParContainer*)fParList->FindCreateObj(clname.c_str());
-        if (par)
-            par->SetupFits(fin);
+        const string cltyped = Form("CLTYPE%d", i);
+        const string cltype  = fin.HasKey(cltyped) ? fin.GetStr(cltyped) : clnamed;
+        const string clname  = fin.GetStr(clnamed);
+
+        MParContainer *par = (MParContainer*)fParList->FindCreateObj(clname.c_str(), cltype.c_str());
+        if (par && !par->SetupFits(fin))
+        {
+            *fLog << err << "ERROR - Setting up " << par->GetDescriptor() << " failed." << endl;
+            return kFALSE;
+        }
     }