Changeset 2858

Timestamp:

01/20/04 15:03:28 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• Makefile (modified) (1 diff)
• Makefile.rules (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mhbase/MH.cc (modified) (1 diff)
• mhist/MHVsTime.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/20: Thomas Bretz
+
+   * Makefile:
+     - replaced 'make' by '$(MAKE)'
+     
+   * Makefile.rules:
+     - added Makefile itself to dependencies
+     
+   * mbase/MTask.cc:
+     - added comment about ReInit
+
+   * mhbase/MH.cc:
+     - do not clear pad in DrawClone if 'same' option given
+
+   * mhist/MHVsTime.cc:
+     - evaluate 'same' option
+
+
 
  2004/01/20: Abelardo moralejo
@@ -11 +30 @@
       fHPCharge, fHPTime.
 
-  * manalysis/MCerPhotPix.h 
+  * manalysis/MCerPhotPix.h: 
     - Changed position of declaration of fIsSaturated to be the last 
       private variable. Otherwise, since in the constructor it is 
@@ -18 +37 @@
 
 
+
  2004/01/20: Markus Gaug
-  * mcalib/Makefile
-  * manalysis/Makefile
+  * mcalib/Makefile, manalysis/Makefile:
     - include directory ../mtools
  
@@ -27 +46 @@
 
 
+
  2004/01/19: Markus Gaug
 
@@ -58 +78 @@
     - Modified way to change the fit function
     - incorporate option to exclude pixels from configuration file
+
 
 

trunk/MagicSoft/Mars/Makefile

@@ -105 +105 @@
 $(LIBRARIES):
         @echo " Creating lib$@:"
-        (cd $*; make; cd ..; mv $*/$@ lib/lib$@)
+        (cd $*; $(MAKE); cd ..; mv $*/$@ lib/lib$@)
 
 $(MRPROPERS):
         @echo " Doing Mr.Proper in $(@:.mrproper=)"
-        (cd $(@:.mrproper=); (make mrproper > /dev/null); cd ..;) 
+        (cd $(@:.mrproper=); ($(MAKE) mrproper > /dev/null); cd ..;) 
 
 $(CLEANERS):
         @echo "Cleaning $(@:.clean=):"
-        (cd $(@:.clean=); make clean; cd ..;) 
+        (cd $(@:.clean=); $(MAKE) clean; cd ..;) 
 
 dox: $(SOLIB)

trunk/MagicSoft/Mars/Makefile.rules

@@ -13 +13 @@
 
 %.d:    
-        @echo " - Generating dependancies" $@
+        @echo " - Generating dependencies" $@
         $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \
-        sed 's/^\(.*\).o:/$@ \1.o:/' > $@
+         sed 's/^\(.*\).o:/$@ \1.o:/' > $@
+        echo "$@: Makefile" >> $@
 
 %.o:    %.cxx

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -60 +60 @@
 //                     return the status 'failed' return kERROR.
 //
+//   - ReInit()        The idea is, that
+//                       a) we have one file per run
+//                       b) each file contains so called run-headers which
+//                          stores information 'per run', eg MRawRunHeader
+//                          or the bad pixels
+//                       c) this information must be evaluated somehow each
+//                          time a new file is opened.
+//
+//                     If you use MReadMarsFile or MCT1ReadPreProc it is
+//                     called each time a new file has been opened and the
+//                     new run headers have been read before the first
+//                     event of these file is preprocessed.
+//
 //   - PostProcess():  executed after the eventloop. Here you can close
 //                     output files, start display of the run parameter,

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -838 +838 @@
         p = MakeDefCanvas(this, w, h);
     else
-        p->Clear();
+        if (!option.Contains("same", TString::kIgnoreCase))
+            p->Clear();
 
     gROOT->SetSelectedPad(NULL);

trunk/MagicSoft/Mars/mhist/MHVsTime.cc

@@ -212 +212 @@
     }
     fGraph->GetHistogram()->SetYTitle(GetRule());
-    fGraph->Draw("AP");
+
+    if (!str.Contains("A"))
+        str += "A";
+    if (!str.Contains("P"))
+        str += "P";
+
+    if (str.Contains("same", TString::kIgnoreCase))
+    {
+        str.ReplaceAll("same", "");
+        str.ReplaceAll("A", "");
+    }
+
+    fGraph->Draw(str);
     if (fGraph->TestBit(kIsLogy))
         pad->SetLogy();