Changeset 7553

Timestamp:

03/01/06 17:20:33 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MTask.cc (modified) (4 diffs)
• mpointing/MHSrcPosCam.cc (added)
• mpointing/MHSrcPosCam.h (added)
• mpointing/MPointingDevCalc.h (modified) (1 diff)
• mpointing/MPointingPosCalc.h (modified) (2 diffs)
• mpointing/Makefile (modified) (1 diff)
• mpointing/PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
      - added new function IsInitialized()
 
+   * mjtrain/MJTrain*.[h,cc]:
+     - added data members to change RF setup
+
+   * mpointing/MPointingDevCalc.h, mpointing/MPointingPosCalc.h:
+     - added missing AddToBranchList
+
+   * mpointing/MHSrcPosCam.[h,cc]:
+     - added
+
+   * mpointing/Makefile, mpointing/PointingLinkDef.h:
+     - added MHSrcPosCam
+
 
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -115 +115 @@
 MTask::MTask(const char *name, const char *title)
     : fFilter(NULL), fSerialNumber(0), fIsPreprocessed(kFALSE),
-    fStopwatch(0), fNumExec0(0)
+    fStopwatch(0), fNumExec0(0), fAccelerator(0)
 {
     fName  = name  ? name  : "MTask";
@@ -257 +257 @@
     //
     const Bool_t exec = fFilter ? fFilter->IsConditionTrue() : kTRUE;
-
     if (!exec)
         return kTRUE;
 
-    fStopwatch->Start(kFALSE);
+    if (!HasAccelerator(kAccDontCount|kAccDontTime))
+        fStopwatch->Start(kFALSE);
     const Int_t rc = Process();
-    fStopwatch->Stop();
+    if (!HasAccelerator(kAccDontTime))
+        fStopwatch->Stop();
 
     return rc;
@@ -428 +429 @@
     *fLog << all << setfill(' ') << setw(lvl) << " ";
 
-    if (GetCpuTime()>0 && time>0 && GetCpuTime()>=0.001*time)
+    if (GetCpuTime()>0 && time>0 && GetCpuTime()>=0.001*time && !HasAccelerator(kAccDontTime))
         *fLog << Form("%5.1f", GetCpuTime()/time*100) << "% ";
     else
@@ -436 +437 @@
         *fLog << GetStreamId() << ":";
     *fLog << GetDescriptor() << "\t";
-    *fLog << dec << GetNumExecutions();
+
+    if (HasAccelerator(kAccDontCount))
+        *fLog << "-/-";
+    else
+        *fLog << dec << GetNumExecutions();
+
     if (fFilter)
         *fLog << " <" << fFilter->GetName() << ">";

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.h

@@ -51 +51 @@
         fName  = "MPointingDevCalc";
         fTitle = "Task calculating the pointing deviation";
+
+        AddToBranchList("MReportStarguider.*");
     }
 

trunk/MagicSoft/Mars/mpointing/MPointingPosCalc.h

@@ -17 +17 @@
     MPointingPos *fPosition; //! Output container to store pointing position
 
-    UShort_t fRunType;            //! Run Type to decide where to get pointing position from
+    UShort_t fRunType;       //! Run Type to decide where to get pointing position from
 
     Bool_t ReInit(MParList *plist);
@@ -28 +28 @@
         fName  = "MPointingPosCalc";
         fTitle = "Task calculating the pointing position";
+
+        AddToBranchList("MReportDrive.*");
+        AddToBranchList("MMcEvt.*");
     }
 

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -29 +29 @@
            MPointingPosInterpolate.cc \
            MHPointing.cc \
+           MHSrcPosCam.cc \
            MSrcPosCam.cc \
            MSrcPosCalc.cc \

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -15 +15 @@
 
 #pragma link C++ class MHPointing+;
+#pragma link C++ class MHSrcPosCam+;
 
 #pragma link C++ class MSrcPosCam+;