Changeset 4322

Timestamp:

06/22/04 14:24:03 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (6 diffs)
• mhist/MHCamera.cc (modified) (1 diff)
• mhist/MHCamera.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
     - added one argument to CntCamContent to tell if event above or 
       below threshold have to be counted. Default is above, like before
+    - added one argument to Projection and ProjectionS giving the number 
+      of bins as argument (default 50 like before)
 
   * mcalib/MCalibrationChargeCalc.cc

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -986 +986 @@
       area[0] = i;
 
-      TH1D *hist = camphes.ProjectionS(TArrayI(),area);
+      TH1D *hist = camphes.ProjectionS(TArrayI(),area,"_py",100);
       hist->Fit("gaus","Q");
       const Float_t mean  = hist->GetFunction("gaus")->GetParameter(1);
@@ -992 +992 @@
       const Int_t   ndf   = hist->GetFunction("gaus")->GetNDF();
 
-      if (ndf < 1)
+      if (ndf < 2)
         {
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the number of photo-electrons " 
@@ -1004 +1004 @@
       const Double_t prob = hist->GetFunction("gaus")->GetProb();
 
-      if (prob < 0.0005)
+      if (prob < 0.001)
         {
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the number of photo-electrons " 
@@ -1394 +1394 @@
       area[0] = i;
 
-      TH1D *hist = camffactor.ProjectionS(TArrayI(),area);
+      TH1D *hist = camffactor.ProjectionS(TArrayI(),area,"_py",100);
       hist->Fit("gaus","Q");
       const Float_t mean  = hist->GetFunction("gaus")->GetParameter(1);
@@ -1400 +1400 @@
       const Int_t   ndf   = hist->GetFunction("gaus")->GetNDF();
 
-      if (ndf < 1)
+      if (ndf < 2)
         {
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the F-Factor " 
@@ -1412 +1412 @@
       const Double_t prob = hist->GetFunction("gaus")->GetProb();
 
-      if (prob < 0.0005)
+      if (prob < 0.001)
         {
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the F-Factor " 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -541 +541 @@
 // into account.
 //
-TH1D *MHCamera::ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name) const
-{
-    Int_t nbins = 50;
+TH1D *MHCamera::ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name, const Int_t nbins) const
+{
 
     // Create the projection histogram

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -240 +240 @@
     UInt_t   GetNumPixels() const;
 
-    TH1D    *Projection(const char *name="_py") const { return ProjectionS(TArrayI(), TArrayI(), name); }
-    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_py") const
-    {
-        return ProjectionS(TArrayI(1, &sector), TArrayI(1, &aidx), name);
-    }
-    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_py") const;
+    TH1D    *Projection(const char *name="_py", const Int_t nbins=50) const
+      {
+        return ProjectionS(TArrayI(), TArrayI(), name,nbins);
+      }
+    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_py", const Int_t nbins=50) const
+    {
+        return ProjectionS(TArrayI(1, &sector), TArrayI(1, &aidx), name, nbins);
+    }
+    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_py", const Int_t nbins=50) const;
 
     TProfile *RadialProfile(const char *name="_rad") const { return  RadialProfileS(TArrayI(), TArrayI(), name);}