Changeset 2466 for trunk/MagicSoft/Mars

Timestamp:

11/04/03 13:47:39 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (2 diffs)
• mraw/MRawSocketRead.cc (modified) (7 diffs)
• mraw/MRawSocketRead.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
    * mimage/MImgCleanStd.cc, mimage/MImgCleanTGB.cc:
      - directly use MGeomCam::GetPixRatioSqrt() now
+
+   * mraw/MRawSocketRead.cc:
+     - updated comment header
+     - updated class description
+     - removed obsolete fMutex, Lock() and UnLock()
+     - moved code from Do() to Process()
+     - added comments
 
 

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -58 +58 @@
 #include <TGraph.h>
 #include <TArrayC.h>
+#include <TVirtualPad.h>
 
 #include "MLog.h"
@@ -213 +214 @@
 //     <index>      The pixel with the given index is drawn
 //
-#include <TVirtualPad.h>
 void MRawEvtData::Draw(Option_t *opt)
 {

trunk/MagicSoft/Mars/mraw/MRawSocketRead.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz, 10/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -24 +24 @@
 
 //////////////////////////////////////////////////////////////////////////////
-//                                                                          //
-//  MRawSocketRead                                                            //
-//                                                                          //
-//  This tasks reads the raw binary file like specified in the TDAS???      //
-//  and writes the data in the corresponding containers which are           //
-//  either retrieved from the parameter list or created and added.          //
-//                                                                          //
-//  Input Containers:                                                       //
-//   -/-                                                                    //
-//                                                                          //
-//  Output Containers:                                                      //
-//   MRawRunHeader, MRawEvtHeader, MRawEvtData, MRawCrateArray, MRawEvtTime //
-//                                                                          //
+//
+//  MRawSocketRead
+//
+//  This tasks reads the raw binary file like specified in the TDAS???
+//  and writes the data in the corresponding containers which are
+//  either retrieved from the parameter list or created and added.
+//
+//  Input Containers:
+//   -/-
+//
+//  Output Containers:
+//   MRawRunHeader, MRawEvtHeader, MRawEvtData, MRawCrateArray, MRawEvtTime
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MRawSocketRead.h"
 
-#include <TMutex.h>
+#include <stdlib.h> // atoi
 
 #include "MReadSocket.h"
@@ -58 +58 @@
 #include "MRawCrateArray.h"
 
+//#include "../mmain/MStatusDisplay.h"
+
 ClassImp(MRawSocketRead);
 
@@ -73 +75 @@
 
     fIn = new MReadSocket(7000);
-    fMutex = new TMutex;
 }
 
@@ -82 +83 @@
 MRawSocketRead::~MRawSocketRead()
 {
-    delete fMutex;
     delete fIn;
 }
@@ -140 +140 @@
 }
 
-Int_t MRawSocketRead::Do()
+// --------------------------------------------------------------------------
+//
+// The Process reads one event from the binary file:
+//  - The event header is read
+//  - the run header is read
+//  - all crate information is read
+//  - the raw data information of one event is read
+//
+Int_t MRawSocketRead::Process()
 {
     /*
@@ -254 +262 @@
     }
 
+    //
+    // If no new event was recorded the DAQ resends an old event
+    //
     if (fEvtNumber==fRawEvtHeader->GetDAQEvtNumber())
         return kCONTINUE;
 
     fEvtNumber=fRawEvtHeader->GetDAQEvtNumber();
-
-    //*fLog << dbg << "Evt " << fRawEvtHeader->GetDAQEvtNumber() << endl;
-
+/*
+    if (fDisplay)
+        fDisplay->SetProgressBarPosition((Float_t)fEvtNumber/fRawRunHeader->GetNumEvents());
+ */
     return kTRUE;
 }
 
-// --------------------------------------------------------------------------
-//
-// The Process reads one event from the binary file:
-//  - The event header is read
-//  - the run header is read
-//  - all crate information is read
-//  - the raw data information of one event is read
-//
-Int_t MRawSocketRead::Process()
-{
-    Lock();
-    Int_t rc = Do();
-    UnLock();
-    return rc;
-}
-
-Int_t MRawSocketRead::Lock()
-{
-    return fMutex->Lock();
-}
-
-Int_t MRawSocketRead::UnLock()
-{
-    return fMutex->UnLock();
-}
+Int_t MRawSocketRead::PostProcess()
+{   /*
+    if (fDisplay)
+        fDisplay->SetProgressBarPosition(1);
+     */
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mraw/MRawSocketRead.h

@@ -6 +6 @@
 #endif
 
-// gcc 3.2
-//class ifstream;
+#ifndef __IOSFWD__
 #include <iosfwd>
+#endif
 
 class MTime;
 class MParList;
+class MReadSocket;
+class MRawEvtData;
+class MRawEvtHeader;
 class MRawRunHeader;
-class MRawEvtHeader;
-class MRawEvtData;
 class MRawCrateArray;
-class MReadSocket;
-class TMutex;
 
 class MRawSocketRead : public MTask
@@ -28 +27 @@
     MTime          *fRawEvtTime;    // raw evt time information container to fill from file
 
-    TMutex *fMutex;
-
     MReadSocket    *fIn;            //! buffered input stream (file to read from)
     MParList       *fParList;       //!
@@ -36 +33 @@
     UInt_t          fEvtNumber;     //!
 
-    Int_t Do();
-
     Int_t PreProcess(MParList *pList);
     Int_t Process();
+    Int_t PostProcess();
 
 public:
@@ -45 +41 @@
     ~MRawSocketRead();
 
-    Int_t Lock();
-    Int_t UnLock();
-
     ClassDef(MRawSocketRead, 0) //Task to read DAQ binary data from tcp/ip socket
 };