Changeset 7682

Timestamp:

05/03/06 08:24:21 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile.rules (modified) (1 diff)
• NEWS (modified) (3 diffs)
• mbase/MTaskList.cc (modified) (1 diff)
• mbase/MTaskList.h (modified) (1 diff)
• mhflux/MHCollectionArea.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/05/03 Thomas Bretz
+
+   * Makefile.rules:
+     - added new option zdiff
+
+
 
  2006/05/02 Thomas Bretz

trunk/MagicSoft/Mars/Makefile.rules

@@ -95 +95 @@
 diff:
         @cvs diff | grep -v "^? " > mars.diff
+
+zdiff:
+        @cvs -z9 diff | grep -v "^? " > mars.diff

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
  *** Version  <cvs>
+
+   - general: Added a new option "zdiff" to the Makefile which runs
+     "cvs diff" as "make diff" would do, but with compression
 
    - general: accelerated MTFillMatrix (used for eample in all training
@@ -65 +68 @@
      trigger (including the software trigger)
 
+   - MTFillMatrix, sponde: by skipping some obsolete calles in the
+     eventloops the loop could be accelerated by ~20%
+
 
 
@@ -125 +131 @@
      applied with this distrbution to the off-data.
 
-   - ganymed: by skipping some obsolete calles in the eventloop the first
-     and second loop could be accelerated by ~20%
+   - ganymed: by skipping some obsolete calles in the eventloop the
+     first and second loop could be accelerated by ~20%
 
    - ganymed: The default in ganymed_onoff.rc is now to determin the source

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -314 +314 @@
 // --------------------------------------------------------------------------
 //
+// Add all objects in list to the tasklist. If some of them do not
+// inherit from MTask return kFALSE, also if AddToList returns an error
+// for one of the tasks
+//
+Bool_t MTaskList::AddToList(const TList &list)
+{
+    TIter Next(&list);
+    TObject *obj=0;
+    while ((obj=Next()))
+    {
+        if (!obj->InheritsFrom(MTask::Class()))
+        {
+            *fLog << err << "ERROR - Object " << obj->GetName() << " doesn't inherit from MTask..." << endl;
+            return kFALSE;
+        }
+
+        if (!AddToList(obj))
+            return kFALSE;
+    }
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 //  Find an object in the list.
 //  'name' is the name of the object you are searching for.

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -47 +47 @@
     Bool_t AddToListAfter(MTask *task, const MTask *where, const char *tType="All");
     Bool_t AddToList(MTask *task, const char *tType="All");
+    Bool_t AddToList(const TList &list);
 
     void SetSerialNumber(Byte_t num);

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -28 +28 @@
 //  MHCollectionArea
 //
+//  Class Version 2:
+//  ----------------
+//   + added //! to fMcEvt which was missing before
+//
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MHCollectionArea.h" 
@@ -59 +64 @@
 //
 MHCollectionArea::MHCollectionArea(const char *name, const char *title)
-  : fMcEvt(0), fEnergy(0), fMcAreaRadius(300.), fIsExtern(kFALSE)
+  : fMcEvt(0), /*fEnergy(0),*/ fMcAreaRadius(300.), fIsExtern(kFALSE)
 { 
     //   initialize the histogram for the distribution r vs E
@@ -163 +168 @@
         return kFALSE;
     }
-
+    /*
     fEnergy = (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
@@ -170 +175 @@
         return kFALSE;
     }
-
+    */
     MBinning binst, binse;
     binst.SetEdges(fHistAll, 'x');