Changeset 1952 for trunk/MagicSoft/Mars/mfileio

Timestamp:

04/12/03 16:50:35 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MCT1ReadPreProc.cc (modified) (6 diffs)
• MCT1ReadPreProc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -708 +708 @@
     //  look for the HourAngle container in the plist
     //
-    fHourAngle = (MParameterD*)pList->FindCreateObj("MParameterD","HourAngle");
+    fHourAngle = (MParameterD*)pList->FindCreateObj("MParameterD", "HourAngle");
     if (!fHourAngle)
         return kFALSE;
@@ -716 +716 @@
     //  look for the ThetaOrig container in the plist
     //
-    fThetaOrig = (MParameterD*)pList->FindCreateObj("MParameterD","ThetaOrig");
+    fThetaOrig = (MParameterD*)pList->FindCreateObj("MParameterD", "ThetaOrig");
     if (!fThetaOrig)
         return kFALSE;
@@ -826 +826 @@
 // Mars structures and data members
 //
-void MCT1ReadPreProc::ProcessEvent(const struct eventrecord &event)
+Bool_t MCT1ReadPreProc::ProcessEvent(const struct eventrecord &event)
 {
     /*
@@ -912 +912 @@
     fThetaOrig->SetVal(theta);
 
-    //*fLog << "Theta, smearedTheta = " << theta << ",  " << SmearTheta(theta)
-    //      << endl;
+    if (theta>TMath::Pi()/2)
+        return kCONTINUE;
 
     // store hour angle
@@ -959 +959 @@
     fMcTrig->SetReadyToSave();
     fMcEvt->SetReadyToSave();
+
+    return kTRUE;
 }
 
@@ -1085 +1087 @@
     fIn->read((Byte_t*)&event, sizeof(struct eventrecord));
 
-    ProcessEvent(event);
+    switch (ProcessEvent(event))
+    {
+    case kFALSE:
+        return kFALSE;
+    case kCONTINUE:
+        return kCONTINUE;
+    }
 
     fNumEvents++;

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -68 +68 @@
     Bool_t CheckFilePosition();
     void   ProcessRunHeader(const struct outputpars &outpars);
-    void   ProcessEvent(const struct eventrecord &event);
+    Bool_t ProcessEvent(const struct eventrecord &event);
 
     Double_t SmearTheta(Double_t theta);