Changeset 7142 for trunk/MagicSoft/Mars/mhbase

Timestamp:

06/10/05 13:10:09 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.cc (modified) (5 diffs)
• MBinning.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -261 +261 @@
 //  lo: lowest edge
 //  hi: highest edge
-//  type: "lin" <default>, "log", "cos" (without quotationmarks)
+//  type: "lin" <default>, "log", "cos", "asin" (without quotationmarks)
 //  title: Whatever the title might be
 //
@@ -296 +296 @@
         str.Remove(0, pos);
         str = str.Strip(TString::kBoth);
-        if (typ!=(TString)"lin" && typ!=(TString)"log" && typ!=(TString)"cos")
+        if (typ!=(TString)"lin" && typ!=(TString)"log" && typ!=(TString)"cos" && typ!=(TString)"asin")
         {
             *fLog << warn << GetDescriptor() << "::SetEdges: Type " << typ << " unknown... ignored." << endl;
@@ -384 +384 @@
         return;
     }
+    if (o.Contains("asin", TString::kIgnoreCase))
+    {
+        SetEdgesASin(nbins, lo, up);
+        return;
+    }
     if (o.Contains("cos", TString::kIgnoreCase))
     {
@@ -420 +425 @@
     const Axis_t ud = up/kRad2Deg;
 
-    const Double_t binsize = (cos(ld)-cos(ud))/nbins;
+    const Double_t cld = ld<0 ? cos(ld)-1 : 1-cos(ld);
+    const Double_t cud = ud<0 ? cos(ud)-1 : 1-cos(ud);
+
+    SetEdgesASin(nbins, ld, ud);
+    /*
+    const Double_t binsize = (cld-cud)/nbins;
     fEdges.Set(nbins+1);
     for (int i=0; i<=nbins; i++)
-        fEdges[i] = acos(cos(ld)-binsize*i)*kRad2Deg;
+    {
+        const Double_t a = cld-binsize*i;
+        fEdges[i] = a<0 ? -acos(1+a)*kRad2Deg : acos(1-a)*kRad2Deg;
+        cout << a << " " << fEdges[i] << endl;
+    }
+
+    fType = kIsCosinic;*/
+}
+
+// --------------------------------------------------------------------------
+//
+// Specify the number of bins <nbins> (not the number of edges), the
+// lowest [deg] <lo> and highest [deg] <up> Edge (of your histogram)
+//
+void MBinning::SetEdgesASin(const Int_t nbins, Axis_t lo, Axis_t up)
+{
+    const Double_t binsize = nbins<=0 ? 0 : (up-lo)/nbins;
+    fEdges.Set(nbins+1);
+    for (int i=0; i<=nbins; i++)
+    {
+        const Double_t a = binsize*i + lo;
+        fEdges[i] = a<0 ? -acos(1+a)*kRad2Deg : acos(1-a)*kRad2Deg;
+    }
 
     fType = kIsCosinic;
@@ -543 +575 @@
     {
         type = GetEnvValue(env, prefix, "Type", "lin");
-        if (type!=(TString)"lin" && type!=(TString)"log" && type!=(TString)"cos")
+        if (type!=(TString)"lin" && type!=(TString)"log" && type!=(TString)"cos" && type!=(TString)"acos")
         {
             *fLog << warn << GetDescriptor() << "::ReadEnv - WARNING: Type is not lin, log nor cos... assuming lin." << endl;

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -66 +66 @@
     void SetEdgesLog(const Int_t nbins, const Axis_t lo, Axis_t up);
     void SetEdgesCos(const Int_t nbins, const Axis_t lo, Axis_t up);
+    void SetEdgesASin(const Int_t nbins, Axis_t lo, Axis_t up);
 
     Int_t FindLoEdge(Double_t val) const