Changeset 91ef0b8 in git for examples

Timestamp:

Mar 7, 2021, 9:48:26 AM (4 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

bd33fce

Parents:

0d65492 (diff), 363e269 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fixed conflicts and Reginv3

Location:

examples

Files:

• Example6.C (modified) (5 diffs)
• ExamplePVtxFit.C (modified) (8 diffs)

examples/Example6.C

@@ -64 +64 @@
         // CEntral track over min Pt
         TH1* histPtgenC = new TH1F("h_PtgenC", "Generated Pt - Central", 500, 0., 50.);         // pt for central tracks;
-        TH1* histPtobsC = new TH1F("h_PtobsC", "Reconstructed Pt - Central", 500, 0., 50.);     // pt for central 
+        TH1* histPtobsC = new TH1F("h_PtobsC", "Reconstructed Pt - Central", 500, 0., 50.);     // pt for central
         TH1* histCtgenH = new TH1F("h_CtgenH", "Generateded Cotangent", 100, -10., 10.);                // cot(theta) for high pt tracks;
         TH1* histCtobsH = new TH1F("h_CtobsH", "Reconstructed Cotangent", 100, -10., 10.);      // cot(theta) for high pt tracks
@@ -77 +77 @@
         //
         // Get magnetifc field
-        Double_t Bz = 2.0;
+        Double_t Bz = treeReader->GetInfo("Bz");
 
         // Loop over all events
@@ -107 +107 @@
                                 histCtobs->Fill(obsCtg);
                                 //
-                                // Get associated generated particle 
+                                // Get associated generated particle
                                 GenParticle* gp = (GenParticle*)trk->Particle.GetObject();
                                 //
@@ -162 +162 @@
                                         GenParticle* gpart = (GenParticle*)branchGenPart->At(it);
                                         //
-                                        // Plot charged particle parameters 
+                                        // Plot charged particle parameters
                                         // Only final state particles (Status = 1)
                                         if (gpart->Status == 1 && TMath::Abs(gpart->Charge) > 0) {
@@ -290 +290 @@
         histAccCtgH->Draw();
         Cnv5->cd(3); gPad->SetLogy(1);
-        histPtgenC->Draw(); 
+        histPtgenC->Draw();
         histPtobsC->SetLineColor(kRed);
         histPtobsC->Draw("SAME");

examples/ExamplePVtxFit.C

@@ -1 +1 @@
 /*
 Example of using vertex fitter class to fit primary vertex
-assumed to be generated in (0,0,0).
-To run compiled version:
-root
-root> .L examples/LoadPvtxFit.C+
-root> LoadPVtxFit()
-root> ExamplePVtxFit("infile.root", Nevents)
+assumed to be generated in (0,0,0)
+*/
 
-March 4, 2021
-F. Bedeschi, INFN-Pisa, Italy
-*/
+#ifdef __CLING__
+R__LOAD_LIBRARY(libDelphes)
 
 #include "classes/DelphesClasses.h"
@@ -18 +13 @@
 #include "external/TrackCovariance/VertexFit.h"
 
-#include <TClonesArray.h>
-#include <TChain.h>
-#include <TVectorD.h>
-#include <TMatrixDSym.h>
-#include <TH1.h>
-#include <TCanvas.h>
-#include <TStyle.h>
+#endif
+
 
 //------------------------------------------------------------------------------
@@ -50 +40 @@
         //
         // Loop over all events
-        Int_t Nev = TMath::Min(Nevent, (Int_t) numberOfEntries);
+        Int_t Nev = TMath::Min(Nevent, (Int_t)numberOfEntries);
         for (Int_t entry = 0; entry < Nev; ++entry)
         {
@@ -56 +46 @@
                 treeReader->ReadEntry(entry);
                 Int_t Ntr = 0;  // # of tracks from primary vertex
-                Int_t NtrG = branchTrack->GetEntries(); // Total # of tracks
+                Int_t NtrG = branchTrack->GetEntries();
                 TVectorD** pr = new TVectorD * [NtrG];
                 TMatrixDSym** cv = new TMatrixDSym * [NtrG];
@@ -68 +58 @@
                                 Track* trk = (Track*)branchTrack->At(it);
                                 //
-                                // Get associated generated particle 
+                                // Get associated generated particle
                                 GenParticle* gp = (GenParticle*)trk->Particle.GetObject();
                                 //
-                                // Position of origin (mm)
+                                // Position of origin in mm
                                 Double_t x = gp->X;
                                 Double_t y = gp->Y;
                                 Double_t z = gp->Z;
                                 //
-                                // Select group of tracks originating from the primary vertex
+                                // group tracks originating from the primary vertex
                                 if (x == 0.0 && y == 0.0)
                                 {
@@ -90 +80 @@
                                         //
                                         pr[Ntr] = new TVectorD(obsPar);
-                                        cv[Ntr] = new TMatrixDSym(TrkUtil::CovToMm(trk->CovarianceMatrix()));
+                                        //std::cout<<"Cov Matrix:"<<std::endl;
+                                        //trk->CovarianceMatrix().Print();
+                                        cv[Ntr] = new TMatrixDSym(trk->CovarianceMatrix());
                                         Ntr++;
                                 }
@@ -115 +107 @@
                 }
 
+                //std::cout << "Vertex chi2/Ndof = " << Chi2 / Ndof << std::endl;
                 //
                 // Cleanup
@@ -125 +118 @@
         // Show resulting histograms
         //
-        TCanvas* Cnv = new TCanvas("Cnv", "Delphes primary vertex fit pulls", 50, 50, 900, 500);
+        TCanvas* Cnv = new TCanvas("Cnv", "Delphes primary vertex pulls", 50, 50, 900, 500);
         Cnv->Divide(2, 2);
-        Cnv->cd(1); gPad->SetLogy(1); gStyle->SetOptFit(1111);  
+        Cnv->cd(1); gPad->SetLogy(1); gStyle->SetOptFit(1111);
         hXpull->Fit("gaus"); hXpull->Draw();
-        Cnv->cd(2); gPad->SetLogy(1); gStyle->SetOptFit(1111);  
+        Cnv->cd(2); gPad->SetLogy(1); gStyle->SetOptFit(1111);
         hYpull->Fit("gaus"); hYpull->Draw();
         Cnv->cd(3); gPad->SetLogy(1); gStyle->SetOptFit(1111);