Changeset 7491

Timestamp:

02/10/06 10:39:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• Makefile.rules (modified) (1 diff)
• NEWS (modified) (1 diff)
• mastro/MAstroCatalog.cc (modified) (2 diffs)
• mastro/MAstroCatalog.h (modified) (2 diffs)
• mimage/MHHillas.cc (modified) (1 diff)
• msignal/MExtractTimeAndChargeSpline.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
    * mimage/MHHillas.cc:
      - set minimum of fDelte to 0 instead of fDistC
+
+   * msignal/MExtractTimeAndChargeSpline.h:
+     - replaced the casts in SetRiseTimeHiGain and StFallTimeHiGain by
+       TMath::NInt
 
 

trunk/MagicSoft/Mars/Makefile

@@ -73 +73 @@
 #LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
 LIBRARIES = $(SUBDIRS:=.a)
+CONDOR    = $(SUBDIRS:=.condor)
 MRPROPERS = $(SUBDIRS:=.mrproper)
 CLEANERS  = $(SUBDIRS:=.clean)
@@ -124 +125 @@
 endif
 
+condor: $(CONDOR)
+
 dox: $(SOLIB)
         @echo

trunk/MagicSoft/Mars/Makefile.rules

@@ -4 +4 @@
         @echo " Doing Mr.Proper in $(@:.mrproper=)"
         (cd $(@:.mrproper=); ($(MAKE) -f Makefile mrproper > /dev/null); cd ..;) 
+
+$(CONDOR):
+        @echo " Starting make in $(@:.condor=) via condor"
+        (cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
 
 $(CLEANERS):

trunk/MagicSoft/Mars/NEWS

@@ -36 +36 @@
      correctly assigned in the raw data assignement table. A fix to correct 
      the assignment tabel have been implemented.
+
+   - general: MAstroCatalog now allows rotating of the sky-grid and stars
+     by 90, 180 and 270 deg.
 
    - StatusDisplay: Fixed the algorithm to calculate the size ratio

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -815 +815 @@
           TestBit(kMirrorY) ? -w(1) : w(1));
 
+    v=v.Rotate(fAngle*TMath::DegToRad());
+
     if (w(2)<0)
         return kERROR;
@@ -1147 +1149 @@
     const Bool_t white  = o.Contains("white",   TString::kIgnoreCase);
     const Bool_t yellow = o.Contains("yellow",  TString::kIgnoreCase) && !white;
+    const Bool_t rot180 = o.Contains("180",     TString::kIgnoreCase);
+    const Bool_t rot270 = o.Contains("270",     TString::kIgnoreCase);
+    const Bool_t rot90  = o.Contains("90",      TString::kIgnoreCase);
 
     if (white)
         SetMarkerColor(kWhite);
+
+    fAngle = 0;
+    if (rot90)
+        fAngle=90;
+    if (rot180)
+        fAngle=180;
+    if (rot270)
+        fAngle=270;
 
     // X is vice versa, because ra is defined anti-clockwise

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -37 +37 @@
 
     TGToolTip *fToolTip;    //! The tooltip currently displayed
+    Double_t   fAngle;      //! Rotation angle of map
 
     MAttLine fAttLineSky;   // Line Style and color for sky coordinates
@@ -169 +170 @@
     void SetMarkerAttributes();   //*MENU*
 
+    TAttLine &GetAttLineSky() { return fAttLineSky; }
+    TAttLine &GetAttLineLocal() { return fAttLineLocal; }
+
     virtual void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected=0);
 

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -91 +91 @@
     fDelta->SetYTitle("Counts");
 
-    fDistC->SetMinimum(0);
+    fDelta->SetMinimum(0);
 
     MBinning bins;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -78 +78 @@
       fRiseTimeLoGain    = f*fLoGainStretch;
       fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
-      fWindowSizeHiGain  = (Int_t)(fRiseTimeHiGain + fFallTimeHiGain);
+      fWindowSizeHiGain  = TMath::Nint(fRiseTimeHiGain + fFallTimeHiGain);
     }
   void SetFallTimeHiGain( const Float_t f=fgFallTimeHiGain    )
@@ -87 +87 @@
       fNumLoGainSamples  = fLoGainLast ? fRiseTimeLoGain + fFallTimeLoGain : 0.;
       fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
-      fWindowSizeLoGain  = (Int_t)(fRiseTimeLoGain + fFallTimeLoGain);
+      fWindowSizeLoGain  = TMath::Nint(fRiseTimeLoGain + fFallTimeLoGain);
     }