Changeset 1920 for trunk

Timestamp:

04/08/03 10:13:47 (22 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/dohtml.C (modified) (1 diff)
• macros/triglvl2.C (modified) (7 diffs)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MMcTriggerLvl2.cc (modified) (1 diff)
• manalysis/MMcTriggerLvl2.h (modified) (1 diff)
• manalysis/MMcTriggerLvl2Calc.cc (modified) (6 diffs)
• manalysis/MMcTriggerLvl2Calc.h (modified) (2 diffs)
• manalysis/Makefile (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (1 diff)
• mhist/MHMcTriggerLvl2.cc (added)
• mhist/MHMcTriggerLvl2.h (added)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/08: Nicola Galante and Antonio Stamerra
+
+   * mhist/MHMcTriggerLvl2.[h,cc]
+      - New class added (histograms for the MMcTriggerLvl2 class)
+
+   * mhist/Makefile
+     - Added MHMcTrigggerLvl2 in SRCFILES
+
+   * manalysis/Makefile
+     - Reintroduced MMcTriggerLvl2 and MMcTriggerLvl2Calc 
+       (they were removed!!)
+
+   * manalysis/MMcTriggerLvl2.h
+     - 'const' added in inline functions Get****
+
+   * manalysis/MMcTriggerLvl2Calc.cc
+     - added call to Fill method of MHMcTriggerLvl2
 
 

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -80 +80 @@
     html.Convert("starplot.C",      "MARS - Plots data from a STAR-file into a mars histogram");
     html.Convert("testenv.C",       "MARS - Example to use TEnv and Mars Eventloops");
+    html.Convert("triglvl2.C",       "MARS - Example to use MMcTriggerLvl2 class, using filters and creating histograms");
 }

trunk/MagicSoft/Mars/macros/triglvl2.C

@@ -2 +2 @@
 //  Macro to use the class MMcTriggerLvl2, which calculates the 
 //   2nd level trigger (L2T) selection parameters.
-//  Filters to select events using these parameter are also created.
+//  Filters to select events using these parameter and 
+//  histograms with selection variables distributions are also created.
 //
 //   Inputs:
@@ -22 +23 @@
     // An instance of the class MMcTriggerLvl2 is created and added to the 
     //  parameter list
-    MMcTriggerLvl2 cell;      
+    MMcTriggerLvl2 cell;     
     parlist.AddToList(&cell);
 
@@ -29 +30 @@
     cell.SetCompactNN(3);
     //  USER:       --^
+
     //
     //  A filter to select events using the L2T parameters is created
     //
-    //    MF lvl2filter("MMcTriggerLvl2.fLutPseudoSize > 6");
-    MF lvl2filter("MMcTriggerLvl2.fSizeBiggerCell > 16");
+    MF lvl2filter("MMcTriggerLvl2.fLutPseudoSize > 8");
+    // MF lvl2filter("MMcTriggerLvl2.fSizeBiggerCell > 16");
+
     //
     // A second filter is created using the class MFTriggerLvl2
@@ -43 +46 @@
     // A selection on the number and energy of the events 
     //
-    MF energyfilter("MMcEvt.fEnergy > 10");
+    MF energyfilter("MMcEvt.fEnergy > 100");
     MFEventSelector selector;
     selector.SetNumSelectEvts(4000);
@@ -69 +72 @@
 
     //
+    //  Task to calculate and plot the effective area
+    //
+    MMcCollectionAreaCalc effi;
+    tasklist.AddToList(&effi);
+
+    //
+    // The filter list selects events for the effective area calculation
+    //
+    effi.SetFilter(&flist);
+ 
+    //
+    // The filter list is added to the task list
+    //
+    tasklist.AddToList(&flist);
+
+    //
     // The task to calculate the L2T parameter is added to the task list
     //
     MMcTriggerLvl2Calc fill("MMcTriggerLvl2","MMcTriggerLvl2");  
     tasklist.AddToList(&fill);
-
-    //
-    //  Task to calculate and plot the effective area
-    //
-    MMcCollectionAreaCalc effi;
-    tasklist.AddToList(&effi);
-    //
-    // The filter list selects events for the effective area calculation
-    //
-    effi.SetFilter(&flist);
-
-    //
-    // The filter list is added to the task list
-    //
-    tasklist.AddToList(&flist);
 
     //
@@ -101 +105 @@
     magic.SetProgressBar(&bar);
 
-    if (!magic.PreProcess())
-      return;
-
     if (!magic.Eventloop())
       return;
 
     tasklist.PrintStatistics();
+ 
     //
     // Now the histogram we wanted to get out of the data is
@@ -114 +116 @@
     parlist.FindObject("MHMcCollectionArea")->DrawClone();
 
-    magic.PostProcess();
+    parlist.FindObject("MHMcTriggerLvl2")->DrawClone("lps");
+    parlist.FindObject("MHMcTriggerLvl2")->DrawClone();
 
+    // Returns histogram of the class MHMcTriggerLvl2  
+    //parlist.FindObject("MHMcTriggerLvl2")->GetHistByName("hfPseudoSize");
+ 
+    
+    
 }

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -62 +62 @@
 #pragma link C++ class MParameterD+;
 
+#pragma link C++ class MMcTriggerLvl2+;
+#pragma link C++ class MMcTriggerLvl2Calc+;
+
 #pragma link C++ class MCT1SupercutsCalc+;
 

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc

@@ -254 +254 @@
   fSizeBiggerCell = GetCellNumberFired(CalcBiggerFiredCell());
  
-
 }
 

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.h

@@ -51 +51 @@
   void SetCompactNN(Int_t neighpix)     {fCompactNN=neighpix;}
 
-  Int_t GetPseudoSize()     {return fPseudoSize;}
-  Int_t GetLutPseudoSize()  {return fLutPseudoSize;}
-  Int_t GetSizeBiggerCell() {return fSizeBiggerCell;}
-  Int_t GetCompactNN()      {return fCompactNN;}
+  Int_t GetPseudoSize()     const {return fPseudoSize;}
+  Int_t GetLutPseudoSize()  const {return fLutPseudoSize;}
+  Int_t GetSizeBiggerCell() const {return fSizeBiggerCell;}
+  Int_t GetCompactNN()      const {return fCompactNN;}
 
   Int_t GetCellNumberFired(int cell);

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc

@@ -37 +37 @@
 #include "MMcTriggerLvl2Calc.h"
 #include "MMcTriggerLvl2.h"
-
+#include "MHMcTriggerLvl2.h"
 
 #include "MParList.h"
@@ -47 +47 @@
 #include "MMcRunHeader.hxx"
 
-#include <TH1.h>
 
 ClassImp(MMcTriggerLvl2Calc);
@@ -61 +60 @@
   fTitle = title ? title : "Task to Fill the MMcTriggerLvl2 object";
   
-  //  AddToBranchList("MMcEvt.fEnergy");
-  //AddToBranchList(Form("%s.fNumFirstLevel", "MMcTrig"));
-  //AddToBranchList(Form("%s.fPixelsFirst[73][4]", "MMcTrig"));
-
-
-  // h1 = new TH1F("h1","h1",30,0,30);
 } 
 
@@ -100 +93 @@
     }
 
+    fMHMcTriggerLvl2 = (MHMcTriggerLvl2*)pList->FindCreateObj("MHMcTriggerLvl2");
+    if (!fMHMcTriggerLvl2)
+    {
+        *fLog << err << dbginf << "MHMcTriggerLvl2 not found... exit." << endl;
+        return kFALSE;
+    }
+
     // Check if the variable fCompactNN has been correctly set;
     //  accepted values for fCompactNN are (up to now) 2 and 3.
@@ -125 +125 @@
 
   fMMcTriggerLvl2->SetLv1(fMcTrig);
+ 
   fMMcTriggerLvl2->Calc();
+
+  fMHMcTriggerLvl2->Fill(fMMcTriggerLvl2);
 
   //fMMcTriggerLvl2->DrawLv1();
   //fMMcTriggerLvl2->DrawCell(fMMcTriggerLvl2->GetBiggerFiredCell() );
   //fMMcTriggerLvl2->Print();
-
-  //      h1->Fill(fMMcTriggerLvl2->GetLutPseudoSize() );
-
 
   return kTRUE;
@@ -146 +146 @@
 { 
   
-  //   *fLog << inf << "Filling..." << endl;
- 
-  //    h1->Draw();
-      
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.h

@@ -12 +12 @@
 
 class MMcTriggerLvl2;
+class MHMcTriggerLvl2;
 
 class TH1F;
@@ -22 +23 @@
 
   MMcTriggerLvl2 *fMMcTriggerLvl2;
+  MHMcTriggerLvl2 *fMHMcTriggerLvl2;
     
  public:

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -69 +69 @@
            MNewImageParCalc.cc \
            MParameters.cc \
+           MMcTriggerLvl2.cc \
+           MMcTriggerLvl2Calc.cc \
            MCT1SupercutsCalc.cc 
 

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -57 +57 @@
 #pragma link C++ class MHMcCT1CollectionArea+;
 
+#pragma link C++ class MHMcTriggerLvl2+;
+
 #pragma link C++ class MHNewImagePar+;
 

trunk/MagicSoft/Mars/mhist/Makefile

@@ -71 +71 @@
            MHNewImagePar.cc \
            MHSigmaTheta.cc \
-           MHMcCT1CollectionArea.cc
+           MHMcCT1CollectionArea.cc \
+           MHMcTriggerLvl2.cc
 
 SRCS    = $(SRCFILES)