Changeset 7818 for trunk/MagicSoft

Timestamp:

07/29/06 11:27:20 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhflux/MHEffectiveOnTime.cc (modified) (1 diff)
• mhflux/MHEffectiveOnTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -280 +280 @@
 
    * mhflux/MHThetaSqN.cc:
-      - removed the const-qualifier from the static_cast when setting
-        tghe MParameterD
+     - removed the const-qualifier from the static_cast when setting
+       tghe MParameterD
 
 

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
  *** Version  <cvs>
 
+   - general: a lot of small changes to make the code compatible with
+     root 5.12/00 and gcc 4.1
+
+   - general: Fixed some warnings thrown if more warnings are switched
+     on in the compiler
+
+   - merpp: didn't recognize files with the extension .raw.gz - fixed.
+
+   - star: changed the fit for the ffective on time such that initial
+       values are calculated automatically now instead of using build
+       in values. This makes the fit more indepedant of the underlaying
+       rates. With a test of ~350 sequences in the test database it could
+       be shown that the new fit gives the same result +/-1sek.
+       The highest deviation was +5s the lowest -10s. You can now control
+       the bahaviour with two resource values:
+          MHEffectiveOnTime.FistBin:   3
+          MHEffectiveOnTime.NumEvents: 12000
+       Use FirstBin=1 and NumEvents=120 to fit the effective on time
+       from the resulting gamma candidates
+
+   - ganymed: now pruduces valid error codes if failed
 
 

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

@@ -1023 +1023 @@
 //
 //    MHEffectiveOnTime.FistBin:   3
-//    MHEffectiveOnTime.NuMEvents: 12000
+//    MHEffectiveOnTime.NumEvents: 12000
 //
 Int_t MHEffectiveOnTime::ReadEnv(const TEnv &env, TString prefix, Bool_t print)

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.h

@@ -43 +43 @@
     TH1D fHTimeEffOn;    // Effective On time versus Time
     TH1D fHTimeProb;     // Chisq prob fit of Effective On time versus Time
-    //TH1D fHTimeNDF;      // NDF vs Time
     TH1D fHTimeLambda;   // Slope (rate) vs Time
 
     Bool_t fIsFinalized; // Flag telling you whether fHThetaEffOn is the final result
 
-    Int_t fNumEvents;    // Number of events to be used for a bin in time
-
-    //const TString fNameProjDeltaT; //! This should make sure, that gROOT doen't confuse the projection with something else
-    //const TString fNameProjTheta;  //! This should make sure, that gROOT doen't confuse the projection with something else
+    UInt_t fNumEvents;   // Number of events to be used for a bin in time
+    UInt_t fFirstBin;    // For bin for fit
 
     Bool_t FitH(TH1D *h, Double_t *res, Bool_t paint=kFALSE) const;
@@ -63 +60 @@
     void PrintStatistics();
 
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, const Stat_t w=1);
+    Bool_t Finalize();
+
+    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+
 public:
     MHEffectiveOnTime(const char *name=NULL, const char *title=NULL);
 
     void SetNumEvents(Int_t i) { fNumEvents=i; }
-
-    Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par, const Stat_t w=1);
-    Bool_t Finalize();
+    void SetFirstBin(Int_t i)  { fFirstBin=i;  }
 
     const TH1D &GetHEffOnTheta() const { return fHThetaEffOn; }
     const TH1D &GetHEffOnTime() const { return fHTimeEffOn; }
 
+    const TH2D &GetH2DeltaT() const { return fH2DeltaT; }
+
     void Draw(Option_t *option="");
     void Paint(Option_t *opt="");
 
-    ClassDef(MHEffectiveOnTime, 1) // Histogram to determin effective On-Time vs Time and Zenith Angle
+    ClassDef(MHEffectiveOnTime, 2) // Histogram to determin effective On-Time vs Time and Zenith Angle
 };