Adding router nr in dcs configuration file and removing ClassDef macro in AliITSOnlin...

diff --git a/ITS/AliITSOnlineCalibrationSPDhandler.cxx b/ITS/AliITSOnlineCalibrationSPDhandler.cxx
index 23f8a779f3d4f7360fb43ee281d7bb90e356e433..73b1f85e261c80b713189217095e22af92266391 100644 (file)
--- a/ITS/AliITSOnlineCalibrationSPDhandler.cxx
+++ b/ITS/AliITSOnlineCalibrationSPDhandler.cxx
@@ -1,3 +1,21 @@
+/**************************************************************************
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+
+/* $Id$ */
+
 //////////////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                           //
 // For easier handling of dead and noisy pixels they are kept in    //
@@ -944,6 +962,7 @@ void AliITSOnlineCalibrationSPDhandler::GenerateDCSConfigFile(const Char_t* file
   dcsfile << "[SPD SCAN]\n";
   dcsfile << "RunNumber=" << "0" << "\n"; // dummy value
   dcsfile << "Type=" << "4" << "\n";
+  dcsfile << "Router=" << "0" << "\n"; // dummy value
   dcsfile << "ActualDetCoonfiguration=" << "0,-1,-1\n"; // dummy values
   dcsfile << "[NOISY]\n";
   for (UInt_t module=0; module<240; module++) {

diff --git a/ITS/AliITSOnlineSPDscanAnalyzer.cxx b/ITS/AliITSOnlineSPDscanAnalyzer.cxx
index 10cca0e86a54c5df2b4d056bf9ff4f829f4d0a09..083c2fdfdb43e7dd06abbfca9f6e967f0bf75d81 100644 (file)
--- a/ITS/AliITSOnlineSPDscanAnalyzer.cxx
+++ b/ITS/AliITSOnlineSPDscanAnalyzer.cxx
@@ -1,3 +1,20 @@
+/**************************************************************************
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 ////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                 //
 // This class is used in the detector algorithm framework //
@@ -31,7 +48,7 @@ Double_t itsSpdErrorf(Double_t *x, Double_t *par){
 
 
 AliITSOnlineSPDscanAnalyzer::AliITSOnlineSPDscanAnalyzer(const Char_t *fileName) :
-  fType(99),fDacId(99),fFileName(fileName),fScanObj(NULL),fTriggers(NULL),
+  fType(99),fDacId(99),fRouterNr(99),fFileName(fileName),fScanObj(NULL),fTriggers(NULL),
   fOverWrite(kFALSE),fNoiseThreshold(0.01),fNoiseMinimumEvents(100),
   fMinNrStepsBeforeIncrease(5),fMinIncreaseFromBaseLine(2),fStepDownDacSafe(2),fMaxBaseLineLevel(10)
 {
@@ -50,7 +67,7 @@ AliITSOnlineSPDscanAnalyzer::AliITSOnlineSPDscanAnalyzer(const Char_t *fileName)
 }
 
 AliITSOnlineSPDscanAnalyzer::AliITSOnlineSPDscanAnalyzer(const AliITSOnlineSPDscanAnalyzer& handle) :
-  fType(99),fDacId(99),fFileName("."),fScanObj(NULL),fTriggers(NULL),
+  fType(99),fDacId(99),fRouterNr(99),fFileName("."),fScanObj(NULL),fTriggers(NULL),
   fOverWrite(kFALSE),fNoiseThreshold(0.01),fNoiseMinimumEvents(100),
   fMinNrStepsBeforeIncrease(5),fMinIncreaseFromBaseLine(2),fStepDownDacSafe(2),fMaxBaseLineLevel(10)
 {
@@ -58,8 +75,6 @@ AliITSOnlineSPDscanAnalyzer::AliITSOnlineSPDscanAnalyzer(const AliITSOnlineSPDsc
   fFileName=handle.fFileName;
 
   fScanObj=NULL;
-  fType=99;
-  fDacId=99;
   for (UInt_t chipNr=0; chipNr<11; chipNr++) {
     for (UInt_t hs=0; hs<6; hs++) {
       fMeanMultiplicity[hs][chipNr]=NULL;
@@ -121,6 +136,7 @@ AliITSOnlineSPDscanAnalyzer& AliITSOnlineSPDscanAnalyzer::operator=(const AliITS
     fScanObj=NULL;
     fType=99;
     fDacId=99;
+    fRouterNr=99;
     for (UInt_t chipNr=0; chipNr<11; chipNr++) {
       for (UInt_t hs=0; hs<6; hs++) {
        fMeanMultiplicity[hs][chipNr]=NULL;
@@ -148,6 +164,7 @@ void AliITSOnlineSPDscanAnalyzer::Init() {
   }
   fScanObj = new AliITSOnlineSPDscan(fFileName.Data());
   fType = fScanObj->GetType();
+  fRouterNr = fScanObj->GetRouterNr();
   delete fScanObj;
 
   // init container

diff --git a/ITS/AliITSOnlineSPDscanAnalyzer.h b/ITS/AliITSOnlineSPDscanAnalyzer.h
index 8a8ef7e41fc4454312e534be4779dae2e6079cbc..e88d8d852dcec972bf38687a923a9da6d9d75a41 100644 (file)
--- a/ITS/AliITSOnlineSPDscanAnalyzer.h
+++ b/ITS/AliITSOnlineSPDscanAnalyzer.h
@@ -1,5 +1,9 @@
 #ifndef ALIITSONLINESPDSCANANALYZER_H
 #define ALIITSONLINESPDSCANANALYZER_H
+/* Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
 
 ////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                 //
@@ -29,6 +33,7 @@ class AliITSOnlineSPDscanAnalyzer {
 
   UInt_t     GetType() const {return fType;}
   UInt_t     GetDacId() const {return fDacId;}
+  UInt_t     GetRouterNr() const {return fRouterNr;}
 
   Int_t      GetDelay(UInt_t hs, UInt_t chipNr);
   Int_t      GetMinTh(UInt_t hs, UInt_t chipNr);
@@ -55,6 +60,7 @@ class AliITSOnlineSPDscanAnalyzer {
  private:
   UInt_t               fType;           // calib type
   UInt_t               fDacId;          // dac id
+  UInt_t               fRouterNr;       // router nr
   TString              fFileName;       // container file name
   enum                 calibvals{kMINTH,kMEANTH,kDAC,kUNIMA,kNOISE,kDELAY};  // calib types
 

diff --git a/ITS/AliITSOnlineSPDscanSingle.cxx b/ITS/AliITSOnlineSPDscanSingle.cxx
index 9a360155f25b4109bc746a7db46eacf0332a2348..0fadffadbe7817547cee294c0d30ee4488db13cc 100644 (file)
--- a/ITS/AliITSOnlineSPDscanSingle.cxx
+++ b/ITS/AliITSOnlineSPDscanSingle.cxx
@@ -1,9 +1,27 @@
+/**************************************************************************
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
 ////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                 //
 // Interface class to the containers of an online scan    //
 // with only one step.                                    //
 ////////////////////////////////////////////////////////////
 
+
 #include <TFile.h>
 #include "AliITSOnlineSPDscanSingle.h"
 #include "AliITSOnlineSPDscanInfo.h"

diff --git a/ITS/AliITSOnlineSPDscanSingle.h b/ITS/AliITSOnlineSPDscanSingle.h
index 4da5d241fc519811e8205888c2eb4464d7c6644c..7a9629a638ddd29da34e8cc97d6e570c7a21410c 100644 (file)
--- a/ITS/AliITSOnlineSPDscanSingle.h
+++ b/ITS/AliITSOnlineSPDscanSingle.h
@@ -1,5 +1,9 @@
 #ifndef ALI_ITS_ONLINESPDSCANSINGLE_H
 #define ALI_ITS_ONLINESPDSCANSINGLE_H  
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
 
 ////////////////////////////////////////////////////////////
 // Author: Henrik Tydesjo                                 //
@@ -16,7 +20,6 @@ class AliITSOnlineSPDscanSingle :  public AliITSOnlineSPDscan {
   AliITSOnlineSPDscanSingle(const Char_t *fileName);
   virtual ~AliITSOnlineSPDscanSingle();
   
-  //  virtual void Clear() {AliITSOnlineSPDscan::Clear(); AddScanStep();}
   // SET METHODS ***********************************
   void     SetHits(UInt_t hs, UInt_t chipi, UInt_t coli, UInt_t rowi, UInt_t val);
   void     IncrementTriggers();
@@ -41,9 +44,6 @@ class AliITSOnlineSPDscanSingle :  public AliITSOnlineSPDscan {
   Float_t  GetAverageMultiplicityTot(UInt_t hs);
 
 
- protected:
-
-  ClassDef(AliITSOnlineSPDscanSingle,1)
-    };
+};
 
 #endif

diff --git a/ITS/ITSSPDda.cxx b/ITS/ITSSPDda.cxx
index 37852877dffe83c579f01e0167b89c48c4a76138..57ee172fa5cf8d9d4d6db364eb0343e856bc8239 100644 (file)
--- a/ITS/ITSSPDda.cxx
+++ b/ITS/ITSSPDda.cxx
@@ -70,7 +70,7 @@ int main(int argc, char **argv) {
   enum calib_types{MINTH,MEANTH,DAC,UNIMA,NOISE,DELAY};
 
 
-  // ********* STEP 0: Get configuration files from db (if there are any) *******************************
+  // ********* STEP 0: Get configuration files from db (if there are any) , then read parameters*********
   UInt_t nrTuningParams = 0;
   TObjArray paramNames;  paramNames.SetOwner(kTRUE);
   TObjArray paramVals;  paramVals.SetOwner(kTRUE);
@@ -465,15 +465,17 @@ int main(int argc, char **argv) {
       analyzer->SetParam(((TString*)paramNames.At(i))->Data(),((TString*)paramVals.At(i))->Data());
     }
 
-    Int_t type  = analyzer->GetType();
-    Int_t dacId = analyzer->GetDacId();
+    UInt_t type  = analyzer->GetType();
+    UInt_t dacId = analyzer->GetDacId();
+    UInt_t routerNr = analyzer->GetRouterNr();
     if (type!=99) {
       if (type==DAC) {
        printf("SPD calibrator Step2: eqId %d, type %d, dacId %d\n",eqId,type,dacId);
       }
       else printf("SPD calibrator Step2: eqId %d type %d\n",eqId,type);  
     }
-    
+
+
 
     // algorithms for the different types of scans:
 
@@ -490,6 +492,7 @@ int main(int argc, char **argv) {
        dcsfile << "[SPD SCAN]\n";
        dcsfile << "RunNumber=" << runNr << "\n";
        dcsfile << "Type=" << type << "\n";
+       dcsfile << "Router=" << routerNr << "\n";
        dcsfile << "ActualDetCoonfiguration=" << "0,-1,-1\n"; // dummy values for now
        dcsfile << "[NOISY]\n";
        nrDCSconfigFilesProduced++;
@@ -532,6 +535,7 @@ int main(int argc, char **argv) {
       dcsfile << "[SPD SCAN]\n";
       dcsfile << "RunNumber=" << runNr << "\n";
       dcsfile << "Type=" << type << "\n";
+      dcsfile << "Router=" << routerNr << "\n";
       dcsfile << "ActualDetCoonfiguration=" << "0,-1,-1\n"; // dummy values for now
       dcsfile << "[DACvalues]\n";
       nrDCSconfigFilesProduced++;
@@ -567,6 +571,7 @@ int main(int argc, char **argv) {
       dcsfile << "[SPD SCAN]\n";
       dcsfile << "RunNumber=" << runNr << "\n";
       dcsfile << "Type=" << type << "\n";
+      dcsfile << "Router=" << routerNr << "\n";
       dcsfile << "ActualDetCoonfiguration=" << "0,-1,-1\n"; // dummy values for now
       dcsfile << "[DACvalues]\n";
       nrDCSconfigFilesProduced++;