Changeset 5300

Timestamp:

10/21/04 09:03:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MLog.cc (modified) (1 diff)
• mfbase/MF.cc (modified) (1 diff)
• mhbase/MH3.cc (modified) (4 diffs)
• mhflux/MHAlpha.cc (modified) (4 diffs)
• mhflux/MHFalseSource.cc (modified) (8 diffs)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -632 +632 @@
     // gcc 3.2:
     char *txt = (char*)"logXXXXXX";
-    fOut = fname ? new ofstream(fname) : new ofstream(/*mkstemp(*/txt/*)*/);
+
+    TString n(fname ? fname : txt);
+    gSystem->ExpandPathName(n);
+    fOut = new ofstream(n.Data());
     fOutAllocated = kTRUE;
 }

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -48 +48 @@
 //   "{log10(MHillas.fSize)}>3"
 //
+// For more details on available functions and expressions see MDataChain!
+//
 // The allowed logigal conditionals are:
 //   &&: logical and

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -478 +478 @@
 
     // FIXME: Do it in Paint()
-    if (str.Contains("COL", TString::kIgnoreCase))
+    /*
+     if (str.Contains("COL", TString::kIgnoreCase))
+    {
         SetColors();
-
-    if (fHist->TestBit(kIsLogx) && fHist->GetEntries()>0) gPad->SetLogx();
-    if (fHist->TestBit(kIsLogy) && fHist->GetEntries()>0) gPad->SetLogy();
-    if (fHist->TestBit(kIsLogz) && fHist->GetEntries()>0) gPad->SetLogz();
-
-    // Set pretty color palette
-    gStyle->SetPalette(1, 0);
-
-    TVirtualPad *padsave = gPad;
-
-    TProfile* h0;
-    if ((h0 = (TProfile*)gPad->FindObject(fNameProfX)))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
-
-        // Move contents from projection to h3
-        h0->Reset();
-        h0->Add(p);
-        delete p;
-
-        // Set Minimum as minimum value Greater Than 0
-        //h0->SetMinimum(GetMinimumGT(*h0));
-    }
-    if ((h0 = (TProfile*)gPad->FindObject(fNameProfY)))
-    {
-        // Get projection for range
-        TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
-
-        // Move contents from projection to h3
-        h0->Reset();
-        h0->Add(p);
-        delete p;
-
-        // Set Minimum as minimum value Greater Than 0
-        //h0->SetMinimum(GetMinimumGT(*h0));
-    }
-
-    gPad = padsave;
+        return;
+    }
+    */
+
+    if (str.Contains("log", TString::kIgnoreCase))
+    {
+        if (fHist->TestBit(kIsLogx) && fHist->GetEntries()>0) gPad->SetLogx();
+        if (fHist->TestBit(kIsLogy) && fHist->GetEntries()>0) gPad->SetLogy();
+        if (fHist->TestBit(kIsLogz) && fHist->GetEntries()>0) gPad->SetLogz();
+    }
+
+    if (str.Contains("upd", TString::kIgnoreCase))
+    {
+
+        // Set pretty color palette
+        // gStyle->SetPalette(1, 0);
+
+        TProfile* h0;
+        if ((h0 = (TProfile*)gPad->FindObject(fNameProfX)))
+            ((TH2*)fHist)->ProfileX(fNameProfX, -1, 9999, "s");
+        if ((h0 = (TProfile*)gPad->FindObject(fNameProfY)))
+            ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
+    }
 }
 
@@ -550 +536 @@
     if (!only)
         fHist->Draw(str);
+
+    AppendPad("upd");
 
     if (str.Contains("PROFX", TString::kIgnoreCase) && fDimension==2)
@@ -562 +550 @@
     {
         TProfile *p = ((TH2*)fHist)->ProfileY(fNameProfY, -1, 9999, "s");
+        p->UseCurrentStyle();
         p->SetLineColor(kBlue);
         p->Draw(only?"":"same");
@@ -568 +557 @@
     }
 
-    AppendPad("");
+    AppendPad("log");
 }
 

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -299 +299 @@
         return;
 
-    const Int_t steps = 6;
+    const Int_t steps = 10;
 
     static int rebin = steps;
@@ -398 +398 @@
 void MHAlpha::PaintText(Double_t val, Double_t error) const
 {
-    TLatex text(0.45, 0.94, Form("N_{exc} = %.1fs \\pm %.1fs", val, error));
+    TLatex text(0.45, 0.94, Form("N_{exc} = %.1f \\pm %.1f", val, error));
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(0.04);
@@ -463 +463 @@
     if (o==(TString)"energy")
     {
-        if (fHEnergy.GetEntries()>10)
+        if (fHEnergy.GetMaximum()>1)
         {
             gPad->SetLogx();
@@ -542 +542 @@
     // Store the final result in fFit
     TH1D *h = fHAlpha.ProjectionZ("AlphaExc_px", -1, 9999, -1, 9999, "E");
+    h->SetDirectory(0);
     fFit.Print();
     Bool_t rc = fFit.Fit(*h);

trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

@@ -120 +120 @@
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TRandom.h>
 #include <TPaveText.h>
 #include <TStopwatch.h>
@@ -146 +147 @@
 using namespace std;
 
+class MHillasExt;
+
 // --------------------------------------------------------------------------
 //
@@ -152 +155 @@
 MHFalseSource::MHFalseSource(const char *name, const char *title)
     : fTime(0), fPointPos(0), fObservatory(0), fMm2Deg(-1), fAlphaCut(12.5),
-    fBgMean(55), fMinDist(-1), fMaxDist(-1), fMinLD(-1), fMaxLD(-1)
+    fBgMean(55), fMinDist(-1), fMaxDist(-1), fMinDW(-1), fMaxDW(-1)
 {
     //
@@ -244 +247 @@
 //
 // Also search for MTime, MObservatory and MPointingPos
-// 
+//
+MHillasExt *ext=0;
 Bool_t MHFalseSource::SetupFill(const MParList *plist)
 {
@@ -251 +255 @@
     {
         *fLog << err << "MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+    ext = (MHillasExt*)plist->FindObject("MHillasExt");
+    if (!ext)
+    {
+        *fLog << err << "MHillasExt not found... aborting." << endl;
         return kFALSE;
     }
@@ -355 +365 @@
 
             // Source dependant hillas parameters
-            if (hsrc.Calc(*hil)>0)
+            if (hsrc.Calc(*hil, ext)>0)
             {
                 *fLog << warn << "Calculation of MHillasSrc failed for x=" << cx[ix] << " y=" << cy[iy] << endl;
@@ -369 +379 @@
                 continue;
 
-            if (fMaxLD>0 && hil->GetLength()>fMaxLD*hsrc.GetDist())
+            if (fMaxDW>0 && hsrc.GetDist()>fMaxDW*hil->GetWidth())
                 continue;
-            if (fMinLD>0 && hil->GetLength()<fMinLD*hsrc.GetDist())
+            if (fMinDW<0 && hsrc.GetDist()<fMinDW*hil->GetWidth())
                 continue;
 
@@ -462 +472 @@
 
     // Get projection for range
-    TH2D *p = (TH2D*)fHist.Project3D("yx_all");
+    TH2D *p = (TH2D*)fHist.Project3D(Form("yx_%d", gRandom->Uniform(999999)));
+    p->SetDirectory(0);
 
     // Move contents from projection to h3

trunk/MagicSoft/Mars/star.cc

@@ -105 +105 @@
         arg.Print("options");
         gLog << endl;
+        return -1;
     }