o add missing ClassImp

o Add HMPID tender supply

diff --git a/ANALYSIS/CMakelibTENDERSupplies.pkg b/ANALYSIS/CMakelibTENDERSupplies.pkg
index 251dc3df601747aff7bb120e6a6ffcaeda85364f..b43e1b2e785eeb6967dc0a6a3d346f552d437321 100644 (file)
--- a/ANALYSIS/CMakelibTENDERSupplies.pkg
+++ b/ANALYSIS/CMakelibTENDERSupplies.pkg
@@ -25,7 +25,17 @@
 # SHLIBS - Shared Libraries and objects for linking (Executables only)           #
 #--------------------------------------------------------------------------------#
 
-set ( SRCS  TenderSupplies/AliTOFTenderSupply.cxx TenderSupplies/AliPIDTenderSupply.cxx   TenderSupplies/AliTPCTenderSupply.cxx TenderSupplies/AliTRDTenderSupply.cxx TenderSupplies/AliVtxTenderSupply.cxx TenderSupplies/AliVZEROTenderSupply.cxx TenderSupplies/AliEMCALTenderSupply.cxx TenderSupplies/AliPHOSTenderSupply.cxx)
+set ( SRCS  
+      TenderSupplies/AliTOFTenderSupply.cxx 
+      TenderSupplies/AliPIDTenderSupply.cxx   
+      TenderSupplies/AliTPCTenderSupply.cxx 
+      TenderSupplies/AliTRDTenderSupply.cxx 
+      TenderSupplies/AliVtxTenderSupply.cxx 
+      TenderSupplies/AliVZEROTenderSupply.cxx 
+      TenderSupplies/AliEMCALTenderSupply.cxx 
+      TenderSupplies/AliPHOSTenderSupply.cxx
+      TenderSupplies/AliHMPIDTenderSupply.cxx
+)
 
 string ( REPLACE ".cxx" ".h"  HDRS "${SRCS}")
 

diff --git a/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.cxx
new file mode 100644 (file)
index 0000000..93dac5d
--- /dev/null
+++ b/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.cxx
@@ -0,0 +1,103 @@
+/**************************************************************************\r
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *\r
+ *                                                                        *\r
+ * Author: The ALICE Off-line Project.                                    *\r
+ * Contributors are mentioned in the code where appropriate.              *\r
+ *                                                                        *\r
+ * Permission to use, copy, modify and distribute this software and its   *\r
+ * documentation strictly for non-commercial purposes is hereby granted   *\r
+ * without fee, provided that the above copyright notice appears in all   *\r
+ * copies and that both the copyright notice and this permission notice   *\r
+ * appear in the supporting documentation. The authors make no claims     *\r
+ * about the suitability of this software for any purpose. It is          *\r
+ * provided "as is" without express or implied warranty.                  *\r
+ **************************************************************************/\r
+\r
+\r
+///////////////////////////////////////////////////////////////////////////////\r
+//                                                                           //\r
+// HMPID tender: - recalculate pid bit using tighter cuts\r
+//               - this is needed for all 2010 and 11a-c data\r
+//             \r
+//             \r
+// Contacts: Giacomo.Volpe@ba.infn.it                                        //\r
+//           Jens.Wiechula@cern.ch                                           //\r
+///////////////////////////////////////////////////////////////////////////////\r
+#include <TMath.h>\r
+#include <TRandom.h>\r
+#include <AliLog.h>\r
+#include <AliESDEvent.h>\r
+#include <AliESDtrack.h>\r
+#include <AliESDInputHandler.h>\r
+#include <AliAnalysisManager.h>\r
+#include <AliESDpid.h>\r
+#include <AliTender.h>\r
+\r
+#include "AliHMPIDTenderSupply.h"\r
+\r
+ClassImp(AliHMPIDTenderSupply)\r
+\r
+AliHMPIDTenderSupply::AliHMPIDTenderSupply() :\r
+AliTenderSupply()\r
+{\r
+  //\r
+  // default ctor\r
+  //\r
+}\r
+\r
+//_____________________________________________________\r
+AliHMPIDTenderSupply::AliHMPIDTenderSupply(const char *name, const AliTender *tender) :\r
+AliTenderSupply(name,tender)\r
+{\r
+  //\r
+  // named ctor\r
+  //\r
+}\r
+\r
+//_____________________________________________________\r
+void AliHMPIDTenderSupply::Init()\r
+{\r
+  // Initialise HMPID tender\r
+  \r
+}\r
+\r
+//_____________________________________________________\r
+void AliHMPIDTenderSupply::ProcessEvent()\r
+{\r
+  //\r
+  // recalculate HMPIDpid bit\r
+  // \r
+  \r
+\r
+  AliESDEvent *event=fTender->GetEvent();\r
+  if (!event) return;\r
+  \r
+  // re-evaluate the HMPIDpid bit for all tracks\r
+  Int_t ntracks=event->GetNumberOfTracks();\r
+  for(Int_t itrack = 0; itrack < ntracks; itrack++){\r
+    AliESDtrack *track=event->GetTrack(itrack);\r
+    if (!itrack) continue;\r
+    //reset pid bit first\r
+    track->ResetStatus(AliESDtrack::kHMPIDpid);\r
+\r
+    Float_t xPc=0., yPc=0., xMip=0., yMip=0., thetaTrk=0., phiTrk=0.;\r
+    Int_t nPhot=0, qMip=0;\r
+ \r
+    track->GetHMPIDtrk(xPc,yPc,thetaTrk,phiTrk);\r
+    track->GetHMPIDmip(xMip,yMip,qMip,nPhot);\r
+    //\r
+    //make cuts, just an example, THIS NEEDS TO BE CHANGED\r
+    //\r
+    //if ((track->GetStatus()&AliESDtrack::kHMPIDout)!=AliESDtrack::kHMPIDout) continue;\r
+   \r
+    Float_t dist = TMath::Sqrt((xPc-xMip)*(xPc-xMip) + (yPc-yMip)*(yPc-yMip));    \r
+\r
+    if(dist > 0.7 || nPhot> 30 || qMip < 100  ) continue;\r
+\r
+    //set pid bit, track was accepted\r
+    track->SetStatus(AliESDtrack::kHMPIDpid);\r
+    \r
+  }\r
+  \r
+  \r
+}\r

diff --git a/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.h b/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.h
new file mode 100644 (file)
index 0000000..2952813
--- /dev/null
+++ b/ANALYSIS/TenderSupplies/AliHMPIDTenderSupply.h
@@ -0,0 +1,40 @@
+#ifndef ALIHMPIDTENDERSUPPLY_H\r
+#define ALIHMPIDTENDERSUPPLY_H\r
+\r
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *\r
+ * See cxx source for full Copyright notice                               */\r
+\r
+////////////////////////////////////////////////////////////////////////\r
+//                                                                    //\r
+//  HMPID tender, reapply pid on the fly                                //\r
+//                                                                    //\r
+////////////////////////////////////////////////////////////////////////\r
+\r
+#include <AliTenderSupply.h>\r
+#include <AliLog.h>\r
+#include <AliESDpid.h>\r
+\r
+class AliESDpid;\r
+\r
+class AliHMPIDTenderSupply: public AliTenderSupply {\r
+\r
+public:\r
+  AliHMPIDTenderSupply();\r
+  AliHMPIDTenderSupply(const char *name, const AliTender *tender=NULL);\r
+\r
+  virtual ~AliHMPIDTenderSupply(){;}\r
+\r
+  virtual void              Init();\r
+  virtual void              ProcessEvent();\r
+\r
+\r
+private:\r
+\r
+  AliHMPIDTenderSupply(const AliHMPIDTenderSupply&c);\r
+  AliHMPIDTenderSupply& operator= (const AliHMPIDTenderSupply&c);\r
+\r
+  ClassDef(AliHMPIDTenderSupply, 1);\r
+};\r
+\r
+\r
+#endif \r

diff --git a/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
index c95a7f5663011d717fac6e448c82345dc0a68f52..81b749290b8fd65e5126eaf9e5c6c3cafe108744 100644 (file)
--- a/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
+++ b/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
@@ -37,6 +37,8 @@
 #include "AliPHOSGeometry.h"
 #include "AliPHOSEsdCluster.h"
 
+ClassImp(AliPHOSTenderSupply)
+
 AliPHOSTenderSupply::AliPHOSTenderSupply() :
   AliTenderSupply()
   ,fOCDBpass("local://OCDB")

diff --git a/ANALYSIS/TenderSupplies/AliTOFTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliTOFTenderSupply.cxx
index 631134df92a3513778055e33004ecb83748a4ab3..f0b8f0f21ce34db85ff8862351b75eebb5cbbd0b 100644 (file)
--- a/ANALYSIS/TenderSupplies/AliTOFTenderSupply.cxx
+++ b/ANALYSIS/TenderSupplies/AliTOFTenderSupply.cxx
@@ -42,6 +42,8 @@
 
 #include "AliTOFTenderSupply.h"
 
+ClassImp(AliTOFTenderSupply)
+
 Float_t AliTOFTenderSupply::fgT0Aresolution = 75.;
 Float_t AliTOFTenderSupply::fgT0Cresolution = 65.;
 

diff --git a/ANALYSIS/TenderSupplies/AliTPCTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliTPCTenderSupply.cxx
index 7865473b9ea046a386f72ac5650f92c570ff728d..78f34b9019942ccb17e7867967037dfcaceb931a 100644 (file)
--- a/ANALYSIS/TenderSupplies/AliTPCTenderSupply.cxx
+++ b/ANALYSIS/TenderSupplies/AliTPCTenderSupply.cxx
@@ -47,6 +47,7 @@
 
 #include "AliTPCTenderSupply.h"
 
+ClassImp(AliTPCTenderSupply)
 
 AliTPCTenderSupply::AliTPCTenderSupply() :
 AliTenderSupply(),

diff --git a/ANALYSIS/TenderSupplies/AliVtxTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliVtxTenderSupply.cxx
index ec3ee3d306a4852882cd8deac19814d9e410a820..0ba50ab3e004b6fe4206b6cf669f1a391ad4e374 100644 (file)
--- a/ANALYSIS/TenderSupplies/AliVtxTenderSupply.cxx
+++ b/ANALYSIS/TenderSupplies/AliVtxTenderSupply.cxx
@@ -31,6 +31,8 @@
 
 #include "AliVtxTenderSupply.h"
 
+ClassImp(AliVtxTenderSupply)
+
 AliVtxTenderSupply::AliVtxTenderSupply() :
   AliTenderSupply(),
   fDiamond(0x0)

diff --git a/ANALYSIS/TenderSuppliesLinkDef.h b/ANALYSIS/TenderSuppliesLinkDef.h
index ce372a802c34e3e0b669ec772ec8d8951a2b397a..097a71dd17652e5bb7ac5692b1d5f8e7cd87a5f7 100644 (file)
--- a/ANALYSIS/TenderSuppliesLinkDef.h
+++ b/ANALYSIS/TenderSuppliesLinkDef.h
@@ -14,4 +14,5 @@
 #pragma link C++ class AliVZEROTenderSupply+;
 #pragma link C++ class AliEMCALTenderSupply+;
 #pragma link C++ class AliPHOSTenderSupply+;
+#pragma link C++ class AliHMPIDTenderSupply+;