Changeset 8592 for trunk/MagicSoft

Timestamp:

06/22/07 16:50:00 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhflux/MHThetaSqN.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/06/22 Thomas Bretz
+
+   * mhflux/MHThetaSqN.cc:
+     - fixed optimization (it just didn't work)
+
+
 
  2007/06/22 Daniela Dorner

trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.8 2006-10-17 17:16:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.9 2007-06-22 15:49:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -212 +212 @@
         return v;
 
-    return TVector2( (*fMatrix)[n1], (*fMatrix)[n1+1] );
+    return TVector2( (*fMatrix)[fMap[n1]], (*fMatrix)[fMap[n1+1]] );
 }
 
 Bool_t MHThetaSqN::Fill(const MParContainer *par, const Stat_t weight)
 {
-    const TVector2 mean(GetVec(fHillas->GetMean(),     6));
-    const TVector2 norm(GetVec(fHillas->GetNormAxis(), 8));
+    const TVector2 norm(GetVec(fHillas->GetNormAxis(), 6));
+    const TVector2 mean(GetVec(fHillas->GetMean(),     8));
 
     const TVector2 org = mean*fMm2Deg + norm*fDisp->GetVal();
@@ -366 +366 @@
         fMap[3] = fMatrix->AddColumn("MPointingPos.fZd");
 
-    fMap[5]  = fMatrix->AddColumn("Disp.fVal");
+    fMap[5]  = -1;
     fMap[6]  = fMatrix->AddColumn("MHillas.fCosDelta");
     fMap[7]  = fMatrix->AddColumn("MHillas.fSinDelta");
@@ -372 +372 @@
     fMap[9]  = fMatrix->AddColumn("MHillas.fMeanY");
     fMap[10] = fMatrix->AddColumn("MSrcPosCam.fX");
-    fMap[11] = fMatrix->AddColumn("MSrcPosCan.fY");
-
-   // if (!fSkipHistTime)
-   //     fMap[4] = fMatrix->AddColumn("MTime.GetAxisTime");
+    fMap[11] = fMatrix->AddColumn("MSrcPosCam.fY");
 }