Changeset 1848 for trunk/MagicSoft/Mars

Timestamp:

03/21/03 09:12:32 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -457 +457 @@
     ProcessRunHeader(outpars);
 
-
     //rwagner: ReInit whenever new run commences
     // rc==-1 means: ReInit didn't work out
 
-    if (!fTaskList->ReInit(fParList))
+    MTaskList *tlist = (MTaskList*)fParList->FindCreateObj("MTaskList");
+    if (!tlist)
+        return -1;
+
+    if (!tlist->ReInit(fParList))
         return -1;
 
@@ -764 +767 @@
         return kFALSE;
 
-    //
-    //  look for the task list
-    //
-    fTaskList = (MTaskList*)pList->FindCreateObj("MTaskList");
-    if (!fTaskList)
-        return kFALSE;
-
-
     fNumFilterEvts = 0;
     fNumEvents     = 0;
@@ -788 +783 @@
 void MCT1ReadPreProc::ProcessEvent(const struct eventrecord &event)
 {
-  if (fRawRunHeader->GetRunNumber() == 1)
-  {
-  *fLog << "eventrecord" << endl;
-  *fLog << "isecs_since_midday = " << event.isecs_since_midday << endl;
-  *fLog << "isecfrac_200ns     = " << event.isecfrac_200ns << endl;
-  *fLog << "snot_ok_flags      = " << event.snot_ok_flags << endl;
-  *fLog << "ialt_arcs          = " << event.ialt_arcs << endl;
-  *fLog << "iaz_arcs           = " << event.iaz_arcs << endl;
-  *fLog << "ipreproc_alt_arcs  = " << event.ipreproc_alt_arcs << endl;
-  *fLog << "ipreproc_az_arcs   = " << event.ipreproc_az_arcs << endl;
-  *fLog << "ifieldrot_arcs     = " << event.ifieldrot_arcs << endl;
-
-  *fLog << "srate_millihz      = " << event.srate_millihz << endl;
-  *fLog << "fhourangle         = " << event.fhourangle << endl;
-  *fLog << "fmcenergy_tev      = " << event.fmcenergy_tev << endl;
-  *fLog << "fmcsize_phel       = " << event.fmcsize_phel << endl;
-  *fLog << "imcimpact_m        = " << event.imcimpact_m << endl;
-  *fLog << "imcparticle        = " << event.imcparticle << endl;
-  *fLog << "imctriggerflag     = " << event.imctriggerflag << endl;
-  }  
-
+    /*
+    if (fRawRunHeader->GetRunNumber() == 1)
+    {
+        *fLog << "eventrecord" << endl;
+        *fLog << "isecs_since_midday = " << event.isecs_since_midday << endl;
+        *fLog << "isecfrac_200ns     = " << event.isecfrac_200ns << endl;
+        *fLog << "snot_ok_flags      = " << event.snot_ok_flags << endl;
+        *fLog << "ialt_arcs          = " << event.ialt_arcs << endl;
+        *fLog << "iaz_arcs           = " << event.iaz_arcs << endl;
+        *fLog << "ipreproc_alt_arcs  = " << event.ipreproc_alt_arcs << endl;
+        *fLog << "ipreproc_az_arcs   = " << event.ipreproc_az_arcs << endl;
+        *fLog << "ifieldrot_arcs     = " << event.ifieldrot_arcs << endl;
+
+        *fLog << "srate_millihz      = " << event.srate_millihz << endl;
+        *fLog << "fhourangle         = " << event.fhourangle << endl;
+        *fLog << "fmcenergy_tev      = " << event.fmcenergy_tev << endl;
+        *fLog << "fmcsize_phel       = " << event.fmcsize_phel << endl;
+        *fLog << "imcimpact_m        = " << event.imcimpact_m << endl;
+        *fLog << "imcparticle        = " << event.imcparticle << endl;
+        *fLog << "imctriggerflag     = " << event.imctriggerflag << endl;
+    }
+    */
 
     for (Int_t i=0; i<iMAXNUMPIX; i++)