Index: trunk/MagicSoft/Mars/mhist/MHMcRate.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcRate.cc (revision 899) +++ trunk/MagicSoft/Mars/mhist/MHMcRate.cc (revision 900) @@ -51,6 +51,6 @@ fBackSim=-1.0; // Number of simulated showers for the background - fTrigRate= -1.0; // Trigger rate in Hz - fTrigRateError= -1.0; // Estimated error for the trigger rate in Hz + fTriggerRate= -1.0; // Trigger rate in Hz + fTriggerRateError= -1.0; // Estimated error for the trigger rate in Hz } @@ -67,6 +67,6 @@ fFlux0=-1.0; // dn/dE = fFlux0 * E^{-a} - fShowRate= -1.0; // Showers rate in Hz - fShowRateError=0.0; // Estimated error of shower rate in Hz + fShowerRate= -1.0; // Showers rate in Hz + fShowerRateError=0.0; // Estimated error of shower rate in Hz } @@ -85,6 +85,6 @@ fFlux0=-1.0; // dn/dE = fFlux0 * E^{-a} - fShowRate= showrate; // Showers rate in Hz - fShowRateError=sqrt(showrate); // Estimated error of shower rate in Hz + fShowerRate= showrate; // Showers rate in Hz + fShowerRateError=sqrt(showrate); // Estimated error of shower rate in Hz } @@ -103,6 +103,6 @@ fFlux0=flux0; // dn/dE = fFlux0 * E^{-a} - fShowRate= -1.0; - fShowRateError=0.0; + fShowerRate= -1.0; + fShowerRateError=0.0; } @@ -130,6 +130,6 @@ // update the limits for energy, theta, phi and impact parameter // -void MHMcRate::Boundaries(Float_t energy, Float_t theta, - Float_t phi, Float_t impact) +void MHMcRate::UpdateBoundaries(Float_t energy, Float_t theta, + Float_t phi, Float_t impact) { // It updates the limit values @@ -163,14 +163,14 @@ const Double_t epowmin = pow(fEnergyMin, specidx); - fShowRate = fFlux0/specidx*(epowmax-epowmin); + fShowerRate = fFlux0/specidx*(epowmax-epowmin); if (fPartId!=1) - fShowRate *= (fPhiMax-fPhiMin)*(cos(fThetaMax)-cos(fThetaMin)); + fShowerRate *= (fPhiMax-fPhiMin)*(cos(fThetaMax)-cos(fThetaMin)); const Double_t impactdiff = fImpactMax-fImpactMin; - fShowRate *= TMath::Pi()*(impactdiff/100.0*impactdiff/100.0); - - fShowRateError = sqrt(fShowRate); + fShowerRate *= TMath::Pi()*(impactdiff/100.0*impactdiff/100.0); + + fShowerRateError = sqrt(fShowerRate); const Double_t anal2 = 1.0-anal*160.0e-9; @@ -179,13 +179,13 @@ // Then the trigger rate and its error is evaluated if(fBackTrig<0){ - fTrigRateError = sqrt((trig*fShowRate*fShowRate/(simu*simu)) + + fTriggerRateError = sqrt((trig*fShowerRate*fShowerRate/(simu*simu)) + (anal2*anal2*1/(fBackSim*back2*back2))); fBackTrig=0; } else - fTrigRateError = sqrt((trig*fShowRate*fShowRate/(simu*simu)) + + fTriggerRateError = sqrt((trig*fShowerRate*fShowerRate/(simu*simu)) + (anal2*anal2*fBackTrig/(back2*back2))); - fTrigRate = trig*fShowRate/simu + anal2*fBackTrig/back2; + fTriggerRate = trig*fShowerRate/simu + anal2*fBackTrig/back2; } @@ -194,8 +194,8 @@ // print the trigger rate // -void MHMcRate::Print() -{ - *fLog << "Incident rate " << fShowRate << " Hz " << endl; - *fLog << "Trigger Rate " << fTrigRate << " +- " << fTrigRateError << " Hz" << endl; +void MHMcRate::Print(Option_t *) +{ + *fLog << "Incident rate " << fShowerRate << " Hz " << endl; + *fLog << "Trigger Rate " << fTriggerRate << " +- " << fTriggerRateError << " Hz" << endl; } @@ -204,5 +204,5 @@ // draw the trigger rate // -void MHMcRate::Draw(Option_t* option) +void MHMcRate::Draw(Option_t *) { *fLog << "To be iplemented" << endl; Index: trunk/MagicSoft/Mars/mhist/MHMcRate.h =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcRate.h (revision 899) +++ trunk/MagicSoft/Mars/mhist/MHMcRate.h (revision 900) @@ -9,57 +9,55 @@ #endif -#define PI_NUMBER 3.1415926 +class MHMcRate : public MParContainer +{ -class MHMcRate : public MParContainer { +private: + UShort_t fPartId; // Type of particle - private: - UShort_t fPartId; // Type of particle + Float_t fEnergyMax; // Maximum Energy in GeV + Float_t fEnergyMin; // Minimum Energy in GeV - Float_t fEnergyMax; // Maximum Energy in GeV - Float_t fEnergyMin; // Minimum Energy in GeV + Float_t fThetaMax; // Maximum theta angle of run + Float_t fThetaMin; // Minimum theta angle of run + Float_t fPhiMax; // Maximum phi angle of run + Float_t fPhiMin; // Minimum phi angle of run - Float_t fThetaMax; // Maximum theta angle of run - Float_t fThetaMin; // Minimum theta angle of run - Float_t fPhiMax; // Maximum phi angle of run - Float_t fPhiMin; // Minimum phi angle of run + Float_t fImpactMax; // Maximum impact parameter + Float_t fImpactMin; // Minimum impact parameter - Float_t fImpactMax; // Maximum impact parameter - Float_t fImpactMin; // Minimum impact parameter - - Float_t fBackTrig; // Number of triggers from background - Float_t fBackSim; // Number of simulated showers for the background + Float_t fBackTrig; // Number of triggers from background + Float_t fBackSim; // Number of simulated showers for the background - Float_t fSpecIndex; // dn/dE = k * e^{- fSpecIndex} - Float_t fFlux0; // dn/dE = fFlux0 * E^{-a} + Float_t fSpecIndex; // dn/dE = k * e^{- fSpecIndex} + Float_t fFlux0; // dn/dE = fFlux0 * E^{-a} - Float_t fShowRate; // Showers rate in Hz - Float_t fShowRateError; // Estimated error of shower rate in Hz + Float_t fShowerRate; // Showers rate in Hz + Float_t fShowerRateError; // Estimated error of shower rate in Hz - Float_t fTrigRate; // Trigger rate in Hz - Float_t fTrigRateError; // Estimated error for the trigger rate in Hz + Float_t fTriggerRate; // Trigger rate in Hz + Float_t fTriggerRateError; // Estimated error for the trigger rate in Hz - void Init(const char *name, const char *title); + void Init(const char *name, const char *title); - public: - - MHMcRate(const char *name=NULL, const char *title=NULL) ; - MHMcRate(Float_t ShowRate, - const char *name=NULL, const char *title=NULL) ; - MHMcRate(Float_t SpecIndex, Float_t Flux0, - const char *name=NULL, const char *title=NULL) ; - ~MHMcRate() ; +public: - void SetParticle(UShort_t part); - void SetBackground (Float_t Showers, Float_t Triggers); + MHMcRate(const char *name=NULL, const char *title=NULL); + MHMcRate(Float_t showrate, + const char *name=NULL, const char *title=NULL); + MHMcRate(Float_t specindex, Float_t flux0, + const char *name=NULL, const char *title=NULL); - void Boundaries(Float_t Energy, Float_t Theta, Float_t Phi, Float_t Impact); + void SetParticle(UShort_t part); + void SetBackground(Float_t showers, Float_t triggers); - void CalcRate(Float_t trig, Float_t anal, Float_t simu); + void UpdateBoundaries(Float_t energy, Float_t theta, Float_t phi, Float_t impact); - void Print(); - void Draw(const Option_t *); + void CalcRate(Float_t trig, Float_t anal, Float_t simu); - ClassDef(MHMcRate, 1) // Data Container to calculate Collection Area -} ; + void Print(Option_t *o=NULL); + void Draw(Option_t *o=NULL); + + ClassDef(MHMcRate, 1) // Data Container to calculate Collection Area +}; #endif