Changeset 8655 for trunk/MagicSoft

Timestamp:

08/02/07 10:46:14 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJSpectrum.cc (modified) (13 diffs)
• mjobs/MJSpectrum.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/08/02 Thomas Bretz
+
+   * mjobs/MJSpectrum.[h,cc]:
+     - made it compile again
+
+
 
  2007/07/29 Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -86 +86 @@
 
 MJSpectrum::MJSpectrum(const char *name, const char *title)
-    : fCutQ(0), fCut0(0),fCut1(0), fCut2(0), fCut3(0), fEstimateEnergy(0),
-    fCalcHadronness(0), fRefill(kFALSE), fSimpleMode(kTRUE),
-    fRawMc(kFALSE), fNoThetaWeights(kFALSE)
+    : fCutQ(0), fCut0(0),fCut1(0), fCut2(0), fCut3(0), fCutS(0),
+    fEstimateEnergy(0), fCalcHadronness(0), fRefill(kFALSE),
+    fSimpleMode(kTRUE), fRawMc(kFALSE), fNoThetaWeights(kFALSE)
 {
     fName  = name  ? name  : "MJSpectrum";
@@ -106 +106 @@
     if (fCut3)
         delete fCut3;
+    if (fCutS)
+        delete fCutS;
     if (fEstimateEnergy)
         delete fEstimateEnergy;
@@ -158 +160 @@
     fLog->Separator("Alpha Fitter");
     *fLog << all;
-    fit.Print();
+    fit.Print("result");
 
     fLog->Separator("Used Cuts");
@@ -164 +166 @@
     fCut0->Print();
     fCut1->Print();
+    fCutS->Print();
     fCut2->Print();
     fCut3->Print();
-
-    //gLog.Separator("Energy Estimator");
-    //fEstimateEnergy->Print();
 }
 
@@ -383 +383 @@
 {
     if (!fDisplay || !fDisplay->CdCanvas("ZdDist"))
-        return;
+    {
+        *fLog << err << "ERROR - Display or tab ZdDist vanished... abort." << endl;
+        return kFALSE;
+    }
 
     TH1D &proj = *h2.ProjectionX();
@@ -459 +462 @@
 // The resulting histogram excess-vs-energy ist copied into h2.
 //
-Bool_t MJSpectrum::Refill(MParList &plist, TH1D &h2) const
+Bool_t MJSpectrum::Refill(MParList &plist, TH1D &h2)/*const*/
 {
     // Try to find the class used to determin the signal!
@@ -478 +481 @@
     }
 
-    cout << "FOUND: "<< cls << endl;
-
     // Now fill the histogram
     *fLog << endl;
@@ -492 +493 @@
     read.AddFile(fPathIn);
 
+    MTaskEnv taskenv0("CalcHadronness");
+    taskenv0.SetDefault(fCalcHadronness);
+
     MEnergyEstimate est;
     MTaskEnv taskenv1("EstimateEnergy");
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
+    MContinue *cont = new MContinue("", "CutS");
+    cont->SetAllowEmpty();
+
+    if (fCutS)
+        delete fCutS;
+    fCutS = cont;
+
     // FIXME: Create HistE and HistEOff to be able to modify it from
     // the resource file.
@@ -509 +520 @@
 
     tlist.AddToList(&read);
+    //tlist.AddToList(&taskenv0); // not necessary, stored in file!
+    tlist.AddToList(fCutS);
     tlist.AddToList(&taskenv1);
     tlist.AddToList(&f0);
@@ -1121 +1134 @@
         return kFALSE;
 
-    // Print the setup of the MAlphaFitter
-    PrintSetup(fit);
     bins3.SetEdges(temp1, 'x');
 
@@ -1144 +1155 @@
     if (!Refill(plist, excess))
         return kFALSE;
+
+    // Print the setup and result of the MAlphaFitter
+    // Print used cuts
+    PrintSetup(fit);
 
     TH2D hist;
@@ -1172 +1187 @@
     else
     {
-        // This rereads the original MC spectrumand aaplies both
-        // weights spectral weights and ZA-weights.
+        // This rereads the original MC spectrum and aplies both
+        // weights, spectral weights and ZA-weights.
         weight.SetNameMcEvt("MMcEvtBasic");
         if (!IntermediateLoop(plist, mh1, temp1, set, weight))
@@ -1298 +1313 @@
     tlist2.AddToList(fCut0);
     tlist2.AddToList(&taskenv0);
+    tlist2.AddToList(fCutS);
     tlist2.AddToList(fCut1);
     tlist2.AddToList(fCut2);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -29 +29 @@
     MTask *fCut2;
     MTask *fCut3;
+    MTask *fCutS;
     MTask *fEstimateEnergy;
     MTask *fCalcHadronness;
@@ -42 +43 @@
     Bool_t  ReadOrigMCDistribution(const MDataSet &set, TH1 &h, MMcSpectrumWeight &w) const;
     Bool_t  GetThetaDistribution(TH1D &temp1, TH1D &temp2) const;
-    Bool_t  Refill(MParList &plist, TH1D &h) const;
+    Bool_t  Refill(MParList &plist, TH1D &h) /*const*/;
     Bool_t  InitWeighting(const MDataSet &set, MMcSpectrumWeight &w) const;